| commit | 4f21ab4ac1591d11d5f83cda8126a0302c2434c3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed May 19 09:44:20 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 19 09:44:20 2010 -0700 |
| tree | 6993687d0c39d4fe3303d40166c0ad7450e9e969 | |
| parent | 3999a2a06f2d6d3099f37e77c39b92ce13257016 [diff] | |
| parent | 7e8b8d4e9cef74f683325bb5097b12e35aefcb16 [diff] |
am b32a74c7: am ee1cdd0e: merge from open-source master