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)
Merge commit '39f130fb905302abb9c4b7fd28029d0014582574'

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


Trivial merge