tree 40680ef0ea635567fa6bbd8fe9c049ef50160c87
parent 81931b8bb302c38828763358f9e15af2b22c52c6
parent ad78b33d9d002643fdb3f8e9d376a36d78212089
author The Android Automerger <android-build@android.com> 1350482360 -0700
committer The Android Automerger <android-build@android.com> 1350482360 -0700

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