| commit | b788f0e912654f3d472020f9c9082d70d09c1622 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 15:59:49 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:59:49 2012 -0800 |
| tree | 8c2dd308407168165604a3f7de729e468d63e21b | |
| parent | 5c10c89b02f4668131a1435e4e6d7c72cc383be4 [diff] | |
| parent | a5ba888d8746c84ba509d074fa3cd7d006e7c803 [diff] |
am a5ba888d: (-s ours) am 37ead709: am ffa91c3c: Reconcile with jb-mr1-release - do not merge * commit 'a5ba888d8746c84ba509d074fa3cd7d006e7c803':