| commit | b238d754edc2fe8673b4ff2cbd0c46151148d609 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 05 08:00:21 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 05 08:00:21 2012 -0800 |
| tree | fb90bdf484d931322c08707793da1131a96353f0 | |
| parent | ce302037b26821b05874812b029c18ea95391868 [diff] | |
| parent | 4fdc57e33a7e06fe2f62d0d986933a7fc1ced378 [diff] |
am 4fdc57e3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4fdc57e33a7e06fe2f62d0d986933a7fc1ced378':