tree b68876a589e063ce86f7e24f6e5aff918995f6e2
parent bf04b5860182d8f4130dcb5d6d88ee68a58c99cd
parent 297181465ffbc80a9eb434da7fae2d5d53bcfca9
author The Android Automerger <android-build@android.com> 1362405337 -0800
committer The Android Automerger <android-build@android.com> 1362405337 -0800

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