| commit | a48b0a04ab5b78b56ac30e40d5d0b1286741a925 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:04:34 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 19:04:34 2012 -0700 |
| tree | 5f4b9ff82f3533926d1872cd5b6c44673f148475 | |
| parent | a98e9bbd2e2b8b6abc636035df0db12c44754f93 [diff] | |
| parent | 32707597009c6a7b15113fb7dd4e89e029e96ff1 [diff] |
am 32707597: (-s ours) am c8cd7d93: am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '32707597009c6a7b15113fb7dd4e89e029e96ff1':