OSDN Git Service

am a77eac54: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:44:26 +0000 (08:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:44:26 +0000 (08:44 -0800)
commit1c5439423412ecadafc6d0fa1154d09f11f31816
treead2bc97c7fd50f044222a8550018d6e64c0089ff
parentff00385c4b31c47c04172b59e50e29cec925fe2e
parenta77eac54a05084c7e47d9389ecd8e47b93c79182
am a77eac54: reconcile main tree with open-source eclair

Merge commit 'a77eac54a05084c7e47d9389ecd8e47b93c79182' into eclair-plus-aosp

* commit 'a77eac54a05084c7e47d9389ecd8e47b93c79182':
  android-2.1_r1 snapshot