| commit | 1e5db2794b72cad45ca65db9065c6ae495a0204f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 13 14:46:26 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 13 14:46:26 2010 -0700 |
| tree | 985f88c39668600de28735484ecb9a4d2a58a218 | |
| parent | a418c3b8370cae1c80fbe9a06e7e53025da5d6f0 [diff] | |
| parent | 4aef0ae660e81ca151a04ce0ddaf956275c70116 [diff] |
am 4aef0ae6: merge from open-source master