OSDN Git Service

am 1c543942: am a77eac54: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:12:19 +0000 (14:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:12:19 +0000 (14:12 -0800)
Merge commit '1c5439423412ecadafc6d0fa1154d09f11f31816'

* commit '1c5439423412ecadafc6d0fa1154d09f11f31816':
  android-2.1_r1 snapshot


Trivial merge