OSDN Git Service

am 39f130fb: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:10:04 +0000 (14:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:10:04 +0000 (14:10 -0800)
commit0b38f2d59add9b1a64f4cf405239b15cc7102d2d
tree450ce35cebd24fc39f8a5b2a9676b0f93c90469a
parent3d97a06be8d204ed5df2c5609e1990bc038d9408
parent39f130fb905302abb9c4b7fd28029d0014582574
am 39f130fb: reconcile main tree with open-source eclair

Merge commit '39f130fb905302abb9c4b7fd28029d0014582574'

* commit '39f130fb905302abb9c4b7fd28029d0014582574':
  android-2.1_r1 snapshot