tree e75fa9f01df739108988e4b16bdc4ba4526a72cf
parent 763363745be3aa2ad10005d5a30a29e84d69c425
parent 8537daeb2e794d936ec86b69c6441ada0ce9afc7
author The Android Automerger <android-build@google.com> 1372337723 -0700
committer The Android Automerger <android-build@google.com> 1372337723 -0700

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