tree c90d502ec7b667b6a407263fdb9a3e9b45a30e4c
parent 37e1052c99c1ba045e8d2197637055ceb4b0c308
parent b6a48228f9738dd9c11f3584853e31caeedc45ab
author The Android Automerger <android-build@google.com> 1371041747 -0700
committer The Android Automerger <android-build@google.com> 1371041747 -0700

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