tree f4d5bcaad7de0324b086160c02d377d6951dab41
parent 7fcbe6d301777c4977df00143717ff673cb603f2
parent 862a3e7a9f31ba41f4a23a14bc84f9b26455ee23
author The Android Automerger <android-build@android.com> 1372110132 -0700
committer The Android Automerger <android-build@android.com> 1372110132 -0700

Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD