| commit | fd5b040ae7eee4a3445a3aab32e163294d137d9b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 13 09:54:44 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 13 09:54:44 2010 -0700 |
| tree | 62c15fc401a7c1b93386844d0a6c80008724a216 | |
| parent | 06a237b0bdc675c016a2618d0d94ce79963d8d9e [diff] | |
| parent | 485b800eacafbf13244ca245f6ddaf47c0d31c08 [diff] |
am 485b800e: am 1a3b3d48: merge from open-source master