| commit | c189f4a026bf5cf7190db732e02f5edcb5f6b0c0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:33:41 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:33:41 2012 -0700 |
| tree | 643274fede34689cec74794c57069a1dfeaa12bc | |
| parent | baca80b57b0d154d2c486e17c8efef04c6e8c67b [diff] | |
| parent | e34e9e498ac6910fc7c9a34aca010febcc750e7f [diff] |
am e34e9e49: (-s ours) Reconcile with jb-mr1-factory-release - do not merge * commit 'e34e9e498ac6910fc7c9a34aca010febcc750e7f':