| commit | 70f5e6ab391c7ed4f45e8d361d5ca02578b09689 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:11:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 19:11:20 2012 -0700 |
| tree | 0dd1cbfba141a98e3a0e198f976a352dec027326 | |
| parent | 9f80e70136128219ac18523e569544547838b4f7 [diff] | |
| parent | 320f0565124718124af733c4e4a6960bed5894d9 [diff] |
am 320f0565: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '320f0565124718124af733c4e4a6960bed5894d9':