| commit | 7900bb1c25bbb42c310421abd385e9be857a9bd4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jul 31 15:05:47 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 31 15:05:47 2012 -0700 |
| tree | 8980096cfe21fc2c948c070206d1d71a6731fd6f | |
| parent | b089ef98cb494c217e56703c4fcbba7b48c84792 [diff] | |
| parent | e0b4f006f7c1dc516b7949c8fd3ee7f1ab2023b2 [diff] |
am e0b4f006: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e0b4f006f7c1dc516b7949c8fd3ee7f1ab2023b2':