| commit | 918d5a1a844e1ad645fe1536496cea0e4f987191 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 11:49:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 11:49:45 2013 -0700 |
| tree | 14baa63cd38cd283fcfb1eea30d49a6193bcc7a9 | |
| parent | 8411cd65e4f6ea42b7ba9cb8dfd33b0856be37aa [diff] | |
| parent | 116ae7da7607208a679e91399d3b3adb9b10a637 [diff] |
am 116ae7da: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '116ae7da7607208a679e91399d3b3adb9b10a637':