| commit | 01f0504764e9a92d0a48d071be73d24d24fdc235 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 06 15:32:57 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 06 15:32:57 2010 -0700 |
| tree | 95f571bce595bd01cee3160711fcbb447afa3fc5 | |
| parent | 1fa16b6a8aa3b50d098d965de30d9dc04798e5b5 [diff] | |
| parent | d37aff7dff9cb3a052d233466ee39abc2359ea24 [diff] |
am 9d164dc5: am f4dffd8a: merge from open-source master