tree 74bb6ce3d42af70ac0e5cdb2a7983afdf3c27429
parent 6d01645739c75116d8940772b80d5b7aba5c39d6
parent 2d8c32f50c725d50c84b750e6b8cf59cea086fad
author The Android Automerger <android-build@android.com> 1364475307 -0700
committer The Android Automerger <android-build@android.com> 1364475307 -0700

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