OSDN Git Service

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

* commit '67bebd06dfa7b4f94520ea2623f1d76e2a28a186':
  android-2.1_r1 snapshot


Trivial merge