| commit | 5d911d775a8467c383583edfbda280c122137ead | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:44:01 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:44:01 2010 -0800 |
| tree | f648558d9b1cb4f4366e16ee782c1f907024e365 | |
| parent | 68e09c63eb03e729183e98b840e0ee4910f60ede [diff] | |
| parent | a37baf0a47b15211bd5c8e0acbd9a9f090587f82 [diff] |
am a37baf0a: reconcile main tree with open-source eclair Merge commit 'a37baf0a47b15211bd5c8e0acbd9a9f090587f82' into eclair-plus-aosp * commit 'a37baf0a47b15211bd5c8e0acbd9a9f090587f82': android-2.1_r1 snapshot