| commit | 574173f74b1f2c26768acc4e45e82eb910ab54e9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:34:12 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:34:12 2012 -0800 |
| tree | 38d9ca70713201a2d5a8e00f590eaf320b9c4516 | |
| parent | 38f60c1ec6cb1f58ddad13a1edc6a1c4dfd2ac9c [diff] | |
| parent | 8be5ea335c6aacb2af1f3c77b19db9509f26e601 [diff] |
am 8be5ea33: (-s ours) am 07c8a6d2: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '8be5ea335c6aacb2af1f3c77b19db9509f26e601':