| commit | 2872bbd8bee999591fb3b27f7f18c81027afd24c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:58:26 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 13:58:26 2010 -0700 |
| tree | 85de471d93e54b5abfdf449ea86b510a34d801dd | |
| parent | 171f2d0fa554bfdb056f193d3eb144922b162410 [diff] | |
| parent | 8c4874eb11ac001d02471eb29a626c339383ebac [diff] |
am 658b7a5a: am 12b6f6ea: am 55b7d124: merge from open-source master