tree 16c0b2fde4589fcbd6d271b6b7a9192349001d96
parent c4ba743cc4e48b9feabccf03959642d63cf7076e
parent ed152bbbaa43332db58b7a78d445a2b326597f26
author The Android Automerger <android-build@google.com> 1370523336 -0700
committer The Android Automerger <android-build@google.com> 1370523336 -0700

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