| commit | b744fcaabefac4a21e0a5f8cc84f0ceb8d685c05 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 14:44:47 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 14:44:47 2010 -0700 |
| tree | 12283462dbf86ce6f21d9a4d5e7757639be0e371 | |
| parent | a89b8871f5ba6f80b18ea74e2cf5ea21c4ac68a9 [diff] | |
| parent | 09cb2f693246b53b747dd0b066c98a95a44feb92 [diff] |
am 2a2174a7: am ccfd99b1: merge from open-source master