| commit | 6d51e8215804fc216936c2cf83c5e83c0a6b282b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:11:22 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:11:22 2010 -0800 |
| tree | d442237617f187e3cf48ecde921d3ac3f8fb20b9 | |
| parent | 846fece685f7c7eb5529cc1eb7578e4576c7b14f [diff] | |
| parent | 20c7cfb334124a537c281c32cc8a13ec37d5957c [diff] |
am 20c7cfb3: am e5a8ce6f: reconcile main tree with open-source eclair Merge commit '20c7cfb334124a537c281c32cc8a13ec37d5957c' * commit '20c7cfb334124a537c281c32cc8a13ec37d5957c': android-2.1_r1 snapshot