tree 5250eda07064acaa846cf05453fa33b5d7c44f4e
parent 89912bec232e5121b56231dc6a5ed173f54ed902
parent 3d0743f088569297a48e7c0c857f97339e3323a3
author The Android Automerger <android-build@android.com> 1332943176 -0700
committer The Android Automerger <android-build@android.com> 1332943176 -0700

merge in jb-release history after reset to master