tree e8694426047f159c3476cb37a13a4d13f2a29c04
parent e8e2610f112103e77ffc4b583a752302921131d6
parent e873a55d7348ea5ecee3a225eba12a8b399913d3
author The Android Automerger <android-build@google.com> 1373547324 -0700
committer The Android Automerger <android-build@google.com> 1373547324 -0700

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