tree d5d536f2c39b8979fa5f818491031a9dceb5fdfb
parent fbba76fe21f937e935dcaebd677b22479d2e32a2
parent 42b04e4cf1935921fe90f9a8eab3327d723435b0
author The Android Automerger <android-build@google.com> 1371839745 -0700
committer The Android Automerger <android-build@google.com> 1371839745 -0700

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