tree dc7107c80cd887f007a8dfab9981d3c3f39dd5b6
parent 2b380488c6b5d21e54e98397c7a8d6a9f16dd8b5
parent 9804cb103da4bb88c87cbb462167fe1054f8b9e7
author The Android Automerger <android-build@android.com> 1347631896 -0700
committer The Android Automerger <android-build@android.com> 1347631896 -0700

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