tree 60399bc2dc30470edce0509340d8e7be50d12276
parent 76c5889325c2ada5dda07fd9af20a4a485978538
parent cd07446afea9a3e5090eb9a92597794f37f85130
author The Android Automerger <android-build@google.com> 1371387349 -0700
committer The Android Automerger <android-build@google.com> 1371387349 -0700

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