| commit | 6d5b5591aa2c3623e88e99a0b0fc7a78c29ef10f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:48:51 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:48:51 2012 -0700 |
| tree | 1e06a078b89671c95ed73af4a7dd3cd89c6df2fd | |
| parent | 3dd6d288f5f7d96d5fb3f78e2324f3310c74de3f [diff] | |
| parent | 3ad7d24a9f397eae674191946b999d577d21090e [diff] |
am 3ad7d24a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3ad7d24a9f397eae674191946b999d577d21090e':