| commit | fc9f20c42514ba6aeea10e62d047742ee758c5ce | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:52:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 07:52:24 2012 -0700 |
| tree | 0d964f3d860da6a1353878cb2c0dc1cd4da93627 | |
| parent | 58573b7a305f3349bc6cfe04ab94686d5334c5f6 [diff] | |
| parent | 917a07d8d28b20b5c3949e784e09c5c4d9f966e4 [diff] |
am 917a07d8: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '917a07d8d28b20b5c3949e784e09c5c4d9f966e4':