OSDN Git Service

am be0a1d3b: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:38:43 +0000 (08:38 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:38:43 +0000 (08:38 -0800)
Merge commit 'be0a1d3b7677d08b928479cfa4fa16b734183ec9' into eclair-plus-aosp

* commit 'be0a1d3b7677d08b928479cfa4fa16b734183ec9':
  android-2.1_r1 snapshot


Trivial merge