| commit | c6b0a84bb565b9f6a124a9a43e5a2f4473ddde54 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 15 08:32:38 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 15 08:32:38 2012 -0700 |
| tree | ecae3b1abaa57c09220319de58927782557558f3 | |
| parent | 5f17728c8cacdc3394f587b089472f3baa25c699 [diff] | |
| parent | a562b0d69699f5b9de5032efacca698c8d857f0f [diff] |
am a562b0d6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a562b0d69699f5b9de5032efacca698c8d857f0f':