| commit | 4a82b9b6c3dad229d13e009ed77df5b3382da3e8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:48:57 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:48:57 2012 -0700 |
| tree | 8d78ebadb9c33191a0490537dbd50da4e6c85b49 | |
| parent | 4b85fbee6fafae65a1d7122555ab8bc68fc20405 [diff] | |
| parent | c05c993c9d11a183c5af24257cd5b4c4b1661706 [diff] |
am c05c993c: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'c05c993c9d11a183c5af24257cd5b4c4b1661706':