| commit | 6df9720b8d3fbd2c4f0095ceda488b0fe1100c52 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 13 09:57:11 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 13 09:57:11 2010 -0700 |
| tree | 42cac1879bb0e2dde74c0fa47e7e3dd35c730c7e | |
| parent | 8b913e8ea50f3381a3fe2a96bdde751e8f381fe3 [diff] | |
| parent | fd5b040ae7eee4a3445a3aab32e163294d137d9b [diff] |
am fd5b040a: am 485b800e: am 1a3b3d48: merge from open-source master