| commit | d5ad8ee590bc79eb5dc64723944a66f150caaced | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Mon Nov 16 14:47:31 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 16 14:47:31 2009 -0800 |
| tree | 770070e4c8fe5f21991b3b163e5ddacc1974229b | |
| parent | 45b36a7bddfa99b1a1f9693ddb6d6da12b219047 [diff] | |
| parent | f78995a8eeb0006eba2d431c379e28aeac0b8b5b [diff] |
am f78995a8: am eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair Merge commit 'f78995a8eeb0006eba2d431c379e28aeac0b8b5b' * commit 'f78995a8eeb0006eba2d431c379e28aeac0b8b5b': SDK Manager: phase 1 of support for future schemas