OSDN Git Service

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

* commit '066e5308dc23b17b3f50ab3459b06ae6ec4bc12a':
  android-2.1_r1 snapshot


Trivial merge