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)
Merge commit 'ba8bfedd04824eea944236ffc885f866c5e9c651' into eclair-plus-aosp

* commit 'ba8bfedd04824eea944236ffc885f866c5e9c651':
  android-2.1_r1 snapshot


Trivial merge