OSDN Git Service

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

* commit '358c03ff70ce697f4b6d57cc048c0c37b5feb3b8':
  android-2.1_r1 snapshot


Trivial merge