| commit | aff37491a130cc0ec0e74916a124156b5c8ecca4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:32:05 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:32:05 2012 -0700 |
| tree | 074a68121b3c75782c48bfe872b2512250b7dfc7 | |
| parent | f0f052f28d5aac369aba919635cf8279e43044d7 [diff] | |
| parent | cf3fa7f45742c870f1478b1bf7717d3042d599d7 [diff] |
am cf3fa7f4: (-s ours) Reconcile with jb-mr1-factory-release - do not merge * commit 'cf3fa7f45742c870f1478b1bf7717d3042d599d7':