OSDN Git Service

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

* commit '0749a3f1c11e052f97a3ba60fd624c9283ee7331':
  android-2.1_r1 snapshot


Trivial merge