| commit | a944379081eaf4355d85178663d7b9091fd9b30e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:19:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:19:21 2012 -0700 |
| tree | dc28f509fae5cb9d3e720e24ddb4d699b538563b | |
| parent | 7f5c1502beda6916caff1fb4b77a48dff3ee90d5 [diff] | |
| parent | f1b2490c0cc52e02de4ddb0682835d2df0240f4c [diff] |
am f1b2490c: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f1b2490c0cc52e02de4ddb0682835d2df0240f4c':
