| commit | fe953c4381f1b0f523ece55753a442eb8665d669 | [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 | 69ec59de282834be17b1795b2f7b1389acfc75b3 | |
| parent | fc97669ad5c11a9b4ec88db9a592a16387092ec9 [diff] | |
| parent | 2a2174a7bdd7a557d3e17b78876b6887a02ebf80 [diff] |
am 2a2174a7: am ccfd99b1: merge from open-source master