tree 6b57aa049d4ae2f73efc4c0bdc3d29b383fbb540
parent 19567fcf6527183c75f1353d045476889b860c08
parent 8d6d6fe2f69aa36461f27899eeac3d97d704663f
author The Android Automerger <android-build@android.com> 1332280839 -0700
committer The Android Automerger <android-build@android.com> 1332280839 -0700

merge in jb-release history after reset to master