| commit | 358a48e12a5d557b2417baf245b63f0e62c879ec | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 12:46:51 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 12:46:51 2009 -0700 |
| tree | ffab5798a186d05319bcf84c0ccdef4ce3a257ae | |
| parent | ef9f4ea0b8e14aefdce5ba25f68393c78e5d0d4c [diff] | |
| parent | 73ef8257ce54ce1ddc2d4cfc3b3814ca734c0e11 [diff] |
merge 73ef8257ce54ce1ddc2d4cfc3b3814ca734c0e11 from donut (resolved conflicts)