| commit | 48bf2d5efac6208cd1ee8bfcecc7815728ffaf54 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 02 07:30:55 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 02 07:30:55 2010 -0700 |
| tree | 5fea2c76ddfa02ed677c08b77a3d17b57f996309 | |
| parent | 9541a5c0c24d846bfb417555581ae17fc95f2f12 [diff] | |
| parent | 74a0b220620c4d328ff05fc6f8c7ce64e00d7091 [diff] |
am 74a0b220: am 740c3e2e: merge from open-source master