| commit | 543e96aa39ab408aaaf83a2de364a01ca07f3689 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:44:45 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:44:45 2010 -0800 |
| tree | 35c1246ec1e68ab5c05a1ba8b94d8f1f8ff8dd99 | |
| parent | a3dfde48027e1a981c50301cceb07fe1a0ff7285 [diff] | |
| parent | 3289d8fe3b5fdaa3a4d95723d81e5ccc9eb42cf7 [diff] |
am 3289d8fe: reconcile main tree with open-source eclair Merge commit '3289d8fe3b5fdaa3a4d95723d81e5ccc9eb42cf7' into eclair-plus-aosp * commit '3289d8fe3b5fdaa3a4d95723d81e5ccc9eb42cf7': android-2.1_r1 snapshot Fix http://b/issue?id=2144841