tree 40663ea59319c8bb8b5805e33181208dcf474076
parent a2042d0ae9dffcfeafe4e2e0b00cee069ce5f773
parent 9f4766c9a7296efd9c8fe550b8d4cd832ae011a5
author The Android Automerger <android-build@android.com> 1349359210 -0700
committer The Android Automerger <android-build@android.com> 1349359210 -0700

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