tree 5508f4e6e33ee71619dcddd820a0be3d51069ea4
parent 406f69c8d62934fb763e691f8baae777f13cb030
parent 30960a2a658066923c616615b08a74456f409a66
author The Android Automerger <android-build@android.com> 1333448882 -0700
committer The Android Automerger <android-build@android.com> 1333448882 -0700

merge in jb-release history after reset to master