| commit | 8c4874eb11ac001d02471eb29a626c339383ebac | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:56:41 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 13:56:41 2010 -0700 |
| tree | a86fbca9a6c2aebc8cc8c558d932c3e4ed9d2744 | |
| parent | 302beca3a500e67d42c4e01e2687b14b529faad4 [diff] | |
| parent | 50c434ca216b2a94f1c30dbfc1635d572a2bf45f [diff] |
am 12b6f6ea: am 55b7d124: merge from open-source master