OSDN Git Service

am 9df17a63: am 066e5308: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:17:14 +0000 (14:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:17:14 +0000 (14:17 -0800)
Merge commit '9df17a63e52390bd56b955611cdde28ca8e231ef'

* commit '9df17a63e52390bd56b955611cdde28ca8e231ef':
  android-2.1_r1 snapshot


Trivial merge