tree c5c6a0babb037380e326c7846a1f515c6d9463ce
parent dee9d17c6855b9d34a9cd0e7946c5890a83a583b
parent bbc5321c844a39231b7a181bdb19f77be1fa52e9
author The Android Automerger <android-build@google.com> 1369918570 -0700
committer The Android Automerger <android-build@google.com> 1369918570 -0700

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