| commit | 19ab6856475706a14e98c754533293c952ad4420 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:33:32 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:33:32 2012 -0700 |
| tree | e50f79c9fb5f73f8c003269ce572551abf965414 | |
| parent | d8f359b17f323cfc9e63e53c0b364a06d10a67b5 [diff] | |
| parent | 02a69132d59289db41ebc6d29068d43c10a3b801 [diff] |
am 02a69132: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '02a69132d59289db41ebc6d29068d43c10a3b801':