OSDN Git Service

am 0341ac9a: am 8916d261: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:17:41 +0000 (14:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:17:41 +0000 (14:17 -0800)
commit3a122f96371905dc80e496660f8cc1032d1cf634
treebdcf7a74567b07a433b0e0d6b5f6a2657caa3005
parent7463f0141f0b5346837c747fbb3918e933e97722
parent0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2
am 0341ac9a: am 8916d261: reconcile main tree with open-source eclair

Merge commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2'

* commit '0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2':
  android-2.1_r1 snapshot