tree 2fbf65bef6266de89b4b02dcf18399f333cd6557
parent c23b380f5c97906717e3f71e20133e88bb5d8e77
parent dbcb4f3990249b4be080cd128ffac984913165b7
author The Android Automerger <android-build@android.com> 1349903203 -0700
committer The Android Automerger <android-build@android.com> 1349903203 -0700

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