| commit | 225732a425d28f63866f1c5d44d09cba7021f2ce | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:09:54 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 21 16:09:54 2012 -0700 |
| tree | 91e7a57d4eb5a2dc3c72b94790bd2c9b14f0819c | |
| parent | 309cdb4e5353dcc0e18e16d30fb806d16fcb2e9b [diff] | |
| parent | 161c1cc8ef87c11e7fcb8a32f8bdf2f3fd627e90 [diff] |
am 161c1cc8: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '161c1cc8ef87c11e7fcb8a32f8bdf2f3fd627e90':