OSDN Git Service

am ba8bfedd: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:44:18 +0000 (08:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:44:18 +0000 (08:44 -0800)
commit1db874720a58ff7e3684116d59ad08bc73db26d9
treeb83ab9148375acd52e67693bd2fd010a8aab0760
parentc0472409d14eebf797df962dd78fc31afbc4bd07
parentba8bfedd04824eea944236ffc885f866c5e9c651
am ba8bfedd: reconcile main tree with open-source eclair

Merge commit 'ba8bfedd04824eea944236ffc885f866c5e9c651' into eclair-plus-aosp

* commit 'ba8bfedd04824eea944236ffc885f866c5e9c651':
  android-2.1_r1 snapshot