tree 6218316845ad145937fc082f7e16405f9fa7f665
parent 23480fbe75113d2658cc5437d9b0745de17c8faf
parent 0045f1cb3732dc3b063daf6e2376b2f88a5cb995
author The Android Automerger <android-build@android.com> 1347199225 -0700
committer The Android Automerger <android-build@android.com> 1347199225 -0700

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