| commit | 3f1a57b170b3149ec4f6584ea46df7883ab75be3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 01 07:44:21 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 01 07:44:21 2013 -0700 |
| tree | 4c7c190348b54b1da2edb6201233e161f4b1f2ab | |
| parent | eb932cbf091455b33843e12d92a7ba0c65e26151 [diff] | |
| parent | 47814b1894748532481adc386f668442fe0a53e7 [diff] |
am 47814b18: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '47814b1894748532481adc386f668442fe0a53e7':