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)
commitf5d8cb450f5077d2f9825ad658aeb20d44642968
tree23c18376d2e90df2591f64ad63c3f6d707bd6b0d
parent60416b73dd9a6844b6cbe476eae96df48138be25
parent1c5439423412ecadafc6d0fa1154d09f11f31816
am 1c543942: am a77eac54: reconcile main tree with open-source eclair

Merge commit '1c5439423412ecadafc6d0fa1154d09f11f31816'

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