diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2013-07-20 18:26:47 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-20 18:26:47 -0700 |
commit | df286ced887d3c2e0bd0b85df88ddc094c51f6a5 (patch) | |
tree | 0e306b1495e7495f490af5d498e3ceadaf61415c /core | |
parent | 89feaeadc25d4c388170587440b1d59bdcb79626 (diff) | |
parent | 62eda460c411b21dce28b8ea6a9ee9245d896dd5 (diff) | |
download | build-df286ced887d3c2e0bd0b85df88ddc094c51f6a5.tar.gz build-df286ced887d3c2e0bd0b85df88ddc094c51f6a5.tar.bz2 build-df286ced887d3c2e0bd0b85df88ddc094c51f6a5.zip |
am 62eda460: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '62eda460c411b21dce28b8ea6a9ee9245d896dd5':
"JSS15I"
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions