tree 83142f38ac6b7c6276570b0ed344440c26ed61c5
parent 1a70c0fd39eed070c2c28fc0731fa689d15931c4
parent 2ffc283435748b134c32efb14db54b5393eb51c8
author The Android Automerger <android-build@google.com> 1372274244 -0700
committer The Android Automerger <android-build@google.com> 1372274244 -0700

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