commit | 1db874720a58ff7e3684116d59ad08bc73db26d9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:44:18 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:44:18 2010 -0800 |
tree | b83ab9148375acd52e67693bd2fd010a8aab0760 | |
parent | c0472409d14eebf797df962dd78fc31afbc4bd07 [diff] | |
parent | ba8bfedd04824eea944236ffc885f866c5e9c651 [diff] |
am ba8bfedd: reconcile main tree with open-source eclair Merge commit 'ba8bfedd04824eea944236ffc885f866c5e9c651' into eclair-plus-aosp * commit 'ba8bfedd04824eea944236ffc885f866c5e9c651': android-2.1_r1 snapshot