tree dc327ad5e9fbc56e58197d64f6a154bb23bc3308
parent da2c158645e10671de990bb71b307d90035320a4
parent af66ca6b19411e4f39c7e5648baea9fe25220fa6
author The Android Automerger <android-build@android.com> 1364302511 -0700
committer The Android Automerger <android-build@android.com> 1364302511 -0700

merge in jb-mr2-release history after reset to jb-mr2-dev