tree 14106a7053d9c5a72f1c9f7edd523ac24704bb99
parent 8720f867c4c292bf71a73078ec287392ad7ed788
parent 623bb0c79e3fd8bbf717505e7cff2ee2b009519c
author The Android Automerger <android-build@android.com> 1372110136 -0700
committer The Android Automerger <android-build@android.com> 1372110136 -0700

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