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)
commit67bebd06dfa7b4f94520ea2623f1d76e2a28a186
treea85323ea0e3877e33820b86a7dea696d32c7a034
parenta06e92b245a3d0061731f26ed2daf2fbf3ebf9ea
parent0749a3f1c11e052f97a3ba60fd624c9283ee7331
am 0749a3f1: reconcile main tree with open-source eclair

Merge commit '0749a3f1c11e052f97a3ba60fd624c9283ee7331' into eclair-plus-aosp

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