| commit | 4c43900ec487c9cb7cfb7349c519f12b1b357c02 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:27:28 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:27:28 2012 -0800 |
| tree | 58aef9ac2318294f57fd8206a18b1888032e141c | |
| parent | 430ac66690359b85ae1b606d12cdc4c22c0d2f61 [diff] | |
| parent | 3a49cd8b15a854ef18aae96a8f32dcd403aa81a8 [diff] |
am 3a49cd8b: (-s ours) am bdcf8251: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '3a49cd8b15a854ef18aae96a8f32dcd403aa81a8':