| commit | fa19844a630b4a9b85a23755e1805d3ae38c7b7d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:35:36 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 06 13:35:36 2012 -0700 |
| tree | 495fc04a3221cb3600dd65ba7effcb5192c0e6de | |
| parent | 813790cb0048c6b91c9dc841dbfa94bdf71e050b [diff] | |
| parent | aef6938a920f9f1bb56ccd464995798d43b5d8c1 [diff] |
am aef6938a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'aef6938a920f9f1bb56ccd464995798d43b5d8c1': JOO37B