| commit | 4434a98b64d7829b5ddb27fe09ffbb374654d797 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 21 09:24:17 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 21 09:24:17 2010 -0700 |
| tree | 8dbff8312d2a832dec494ddeb28f1bb0f44d868a | |
| parent | 95190a548bd04e8fb73b5532f3496318ba10e81a [diff] | |
| parent | a327dcfd79161c7fe48372f35d02918fca04af50 [diff] |
am d29eafdb: am f021d12f: merge from open-source master