| commit | 8915fd90cf07dc3c2b711200714e9ae4f76a612c | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Nov 18 17:14:02 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 18 17:14:02 2009 -0800 |
| tree | 9c578c2a0b7092f968f34f669cd89149e12ca2a5 | |
| parent | e970b3d160719a58ef9c91c637eb5ec9dc95a3fe [diff] | |
| parent | 01d2087c87627df5bfc7e684f62466e0a662197a [diff] |
am 01d2087c: resolved conflicts for merge of 19cb54ea to eclair Merge commit '01d2087c87627df5bfc7e684f62466e0a662197a' into eclair-mr2 * commit '01d2087c87627df5bfc7e684f62466e0a662197a': Remove components that were moved to sdk.git and update build scripts.