| commit | 7c13ed2afba1abe63f39b0f563978e04e849ae00 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 14:11:21 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 04 14:11:21 2010 -0700 |
| tree | a9af3adb5074f72572a7556019b5d9cbce7c24da | |
| parent | db00fdd383809700a01b2a19386f1ca81e94c6f0 [diff] | |
| parent | 1dd067d9defa9fb93e5b14870f230f36cb969b9b [diff] |
am 1dd067d9: am 54709cb2: am bf11852a: merge from open-source master