| commit | 9232a62e9887f6bc2590e108063c6fd7bfa1feda | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 22 08:01:58 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 22 08:01:58 2013 -0700 |
| tree | 0e306b1495e7495f490af5d498e3ceadaf61415c | |
| parent | df286ced887d3c2e0bd0b85df88ddc094c51f6a5 [diff] | |
| parent | 90a4ac4c1eafd897800c72fa8c732f97ffa95d28 [diff] |
am 90a4ac4c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '90a4ac4c1eafd897800c72fa8c732f97ffa95d28': "JSS15J"