tree 9b90978b05bcd43041eaeac3731d1838a0210c6d
parent ac9a96da65f6eae4513654adaad8a457d1c1575c
parent 176c0fdd5b420177d4996b47aaf66c703e5cbab3
author The Android Automerger <android-build@google.com> 1373901552 -0700
committer The Android Automerger <android-build@google.com> 1373901552 -0700

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