| commit | f78995a8eeb0006eba2d431c379e28aeac0b8b5b | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Mon Nov 16 14:41:03 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 16 14:41:03 2009 -0800 |
| tree | 936e545c119d377f2ec850e6c1ce09b74f5e455e | |
| parent | 237c3bc13181c1fb344a8c21af0417c5f86e26e3 [diff] | |
| parent | eeef441637736156e7899ddf2de8ddb7cb197cc9 [diff] |
am eeef4416: am 6dcf4214: resolved conflicts for merge of 0da4f158 to eclair Merge commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9' into eclair-mr2-plus-aosp * commit 'eeef441637736156e7899ddf2de8ddb7cb197cc9': SDK Manager: phase 1 of support for future schemas