tree d0173c1d10f29ba6f2a5d660e1e1a32478dc0ec4
parent 6c604d616ff796f1ec41d4ad7212729cf469e8f5
parent 570c42b6c181a5b3b73ff613b3d909b37baa28eb
author The Android Automerger <android-build@google.com> 1370523343 -0700
committer The Android Automerger <android-build@google.com> 1370523343 -0700

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