| commit | b76351b392ceb5006c91f85f6ab7b12f7a87e81d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:33:50 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:33:50 2012 -0700 |
| tree | a424162e4d5deff66e7df44eb95cfaf8f54bfa77 | |
| parent | 9dba59da3185ff7916acb040b7e0a8f15f56bfc7 [diff] | |
| parent | f5fb2a0656d21a2bcc1dd419d3bbf3dc8f11c181 [diff] |
am f5fb2a06: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'f5fb2a0656d21a2bcc1dd419d3bbf3dc8f11c181':