tree 6e4c7fcdc31371ef36109e0e69aae37e3aca6168
parent d8f789c576d8a6ffe44fdad6056f471210e8a32a
parent 2ed1ced511e7e4b341b5fcbc7fdbb4c06ca00627
author The Android Automerger <android-build@android.com> 1364388917 -0700
committer The Android Automerger <android-build@android.com> 1364388917 -0700

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