tree 0301e396b4caf194b26f9ccc416eef16ea4d1149
parent 42b04e4cf1935921fe90f9a8eab3327d723435b0
parent 2ced32fbd1fb954648d0c91b18fff0e0b22e03b7
author The Android Automerger <android-build@android.com> 1372110112 -0700
committer The Android Automerger <android-build@android.com> 1372110112 -0700

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