| commit | d29b9bef39930fa0fc29cdb20f9754d218d5c79a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 09:54:51 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 04 09:54:51 2010 -0700 |
| tree | 65405f6f8d9e79d306d10ee0b120b0ece224b4b0 | |
| parent | 858e4d5ba227efac06e87d3d0b56a6a6427c5def [diff] | |
| parent | c2f5c0964b8069b2659892483bea94aff12f3995 [diff] |
am c2f5c096: am 4873d8f5: (-s ours) merge from open-source master