tree 65c6059bd12beca43b36d5299337a9d77b4608e4
parent d17e3b5f6cf71eb52bc81f37719254ce08244b34
parent 92f89bd1e0ed26a1dd006d90fbc55eff7d184102
author The Android Automerger <android-build@android.com> 1350949328 -0700
committer The Android Automerger <android-build@android.com> 1350949328 -0700

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