tree d60e069352f24367f1d15ad5cd0dc02a669112b2
parent 91032a9e894d3edd3ad21f87533bda46316c886a
parent 2c77443424c5ccd199b0ec07d1d804bf5be07b00
author The Android Automerger <android-build@google.com> 1370451085 -0700
committer The Android Automerger <android-build@google.com> 1370451085 -0700

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