| commit | 20573dbcef935377e2edf9aeeb6712b09cb8cc4a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:25:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:25:43 2012 -0800 |
| tree | aa88b9539d28adda544cf9a271e518fa4be31f16 | |
| parent | f5d8c015206384e089f6d048a177488b499ac8ee [diff] | |
| parent | 8540cc8909cc16a41c27d64ba704b3a5cb469955 [diff] |
am 85a1f3ff: (-s ours) am 78d3d6b2: am da522b59: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '85a1f3ff6f21de87f55903eb80944eba46c0bf38':