tree 590ba43d6ffed95d57df9b3695a3e2b1ab75a8c2
parent 5887a9d552f3d9d612011daba073e076daab5b2a
parent 36c93fb9432ca8b6c3ae1cfa214dd2e78583885e
author The Android Automerger <android-build@android.com> 1347657018 -0700
committer The Android Automerger <android-build@android.com> 1347657018 -0700

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