tree 76d772f60431758fa34e6218c56bcc393b988ba8
parent 389b5c1ee52cbf0de4dcdfe266832d251f55db62
parent 637d50e6c084a757c4310d70c04b676a60b47aa0
author The Android Automerger <android-build@android.com> 1366894512 -0700
committer The Android Automerger <android-build@android.com> 1366894512 -0700

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