tree e31bc5b473f1d52bd9d4b470807a182a3db42548
parent 8c9a241892d74ecb09c1c9a5eef0848c354f3fb6
parent 8de153db1fdd3c8ae9b85ada6124d45bfc096055
author The Android Automerger <android-build@google.com> 1371041746 -0700
committer The Android Automerger <android-build@google.com> 1371041746 -0700

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