| commit | 20c7cfb334124a537c281c32cc8a13ec37d5957c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:43:02 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:43:02 2010 -0800 |
| tree | 47a404d1d21c8b5b542d6c0a29e7dc6ce9b7aa08 | |
| parent | af6154f52bb590f20f3700e1635776a76b805891 [diff] | |
| parent | e5a8ce6f767a05dae004b1aab912fa681aca685a [diff] |
am e5a8ce6f: reconcile main tree with open-source eclair Merge commit 'e5a8ce6f767a05dae004b1aab912fa681aca685a' into eclair-plus-aosp * commit 'e5a8ce6f767a05dae004b1aab912fa681aca685a': android-2.1_r1 snapshot