OSDN Git Service

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

* commit '217f8ef4c1c151c63382dc0785edd960c233f62e':
  android-2.1_r1 snapshot


Trivial merge