OSDN Git Service

am 7643a1fc: am bff01c69: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:11:42 +0000 (14:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:11:42 +0000 (14:11 -0800)
commitbae6e6fddb97f90cb1d71e748d5507f694356135
treee040480b6f414874813b1bcbb4653c7003f8fef4
parent6ac94e9eb27717b1e282298172ebabb524de7058
parent7643a1fcce0798ff46f485759f4527e5c8067ba7
am 7643a1fc: am bff01c69: reconcile main tree with open-source eclair

Merge commit '7643a1fcce0798ff46f485759f4527e5c8067ba7'

* commit '7643a1fcce0798ff46f485759f4527e5c8067ba7':
  android-2.1_r1 snapshot