tree 52b8231806cb2719f4a8d748851d468337c0f8d8
parent 73fb11d93274bc1c3675b24e910a4cb87571ffd0
parent 8282fd33e6bd7ef24854018a2e52090998bc92b4
author The Android Automerger <android-build@android.com> 1367499327 -0700
committer The Android Automerger <android-build@android.com> 1367499327 -0700

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