| commit | dff3d166f10538e87360a74cab8444665980fcd6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 12 12:16:45 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 12 12:16:45 2010 -0700 |
| tree | 5dc9f19a28431cfeefe79591c9088a75da280fb7 | |
| parent | 2c8e051508daaa605a9fb4a8123b09b9dae50329 [diff] | |
| parent | 1b7e3ef417f236c333c7528e7af5485fc4da664b [diff] |
am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source master