OSDN Git Service

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

* commit '39760b2529e6ef58ab49762703b2ee37fdbd7db5':
  android-2.1_r1 snapshot


Trivial merge