tree 1360583ebd1d6871a3eccd8fe2f4c5de0dfae90c
parent 8c01be686cacb593677dd1a753c132e58aa87661
parent 2145e71b107f88b85df6abd58d2e7b79eb781a61
author The Android Automerger <android-build@google.com> 1373374512 -0700
committer The Android Automerger <android-build@google.com> 1373374512 -0700

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