| commit | b9e8f1f0890b58f17dfcd3ff98f8b2515a22ef04 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 09:56:12 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 04 09:56:12 2010 -0700 |
| tree | 47ff15ca612fb3587b2ee31a0c622ac82865c0b7 | |
| parent | 7c8b1dd3c3ab925cfa14ef58458b55f3bb9e21ab [diff] | |
| parent | d29b9bef39930fa0fc29cdb20f9754d218d5c79a [diff] |
am d29b9bef: am c2f5c096: am 4873d8f5: (-s ours) merge from open-source master