OSDN Git Service

am 8dd38d6b: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:41:15 +0000 (08:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:41:15 +0000 (08:41 -0800)
commit51ca2892bba945142be57171d4e81e836418fb56
tree8e15570e1780bcc8ac40ab1aec5e864a97d6722a
parent9d252c3ba53342fe7eff849251672ddfe6c97ad7
parent8dd38d6bc8918f2153580111fbd8aef6b9f90cc4
am 8dd38d6b: reconcile main tree with open-source eclair

Merge commit '8dd38d6bc8918f2153580111fbd8aef6b9f90cc4' into eclair-plus-aosp

* commit '8dd38d6bc8918f2153580111fbd8aef6b9f90cc4':
  android-2.1_r1 snapshot