| commit | ccb0c7cd00cab3b4368b0501b0767b155d9315ac | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 05 15:43:45 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 05 15:43:45 2010 -0700 |
| tree | 20d784ba4490b67411dd170d56a435d52a2689ff | |
| parent | 54c2901519450c20abdd35346b8a2d78c427aa68 [diff] | |
| parent | 7c1a018fd243bbbf14a2fb45cfe0e2f35720a86f [diff] |
am 7c1a018f: am f9e275b0: merge from open-source master