tree c6f827a58b7a3662745289557272eb6f55ae7039
parent ab17014baf326d69a5bfd153622a1d7da6a4f9ce
parent 5c9b0b26c76c5bf1526d578a8c21b30884e87c5b
author The Android Automerger <android-build@android.com> 1349822340 -0700
committer The Android Automerger <android-build@android.com> 1349822340 -0700

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