commit | 89feaeadc25d4c388170587440b1d59bdcb79626 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 19 16:02:26 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 19 16:02:26 2013 -0700 |
tree | 0e306b1495e7495f490af5d498e3ceadaf61415c | |
parent | bc66ddea44b6909f60062f72c1b4b9245aff6a89 [diff] | |
parent | 7017cfe124721cadd3315a0a5700c83545916673 [diff] |
am 7017cfe1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '7017cfe124721cadd3315a0a5700c83545916673': "JSS15H" "JSS15G" JSS15F "JSS15E" "JSS15D" "JSS15C"