OSDN Git Service

am bff01c69: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:43:55 +0000 (08:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:43:55 +0000 (08:43 -0800)
commit7643a1fcce0798ff46f485759f4527e5c8067ba7
tree195e76d8525df942743c735a1297427ae49c6d18
parentd9514070f3357bed9a984b2bc36b39ac19978ae1
parentbff01c69cb84d9bf444edfb181b32b0240893aac
am bff01c69: reconcile main tree with open-source eclair

Merge commit 'bff01c69cb84d9bf444edfb181b32b0240893aac' into eclair-plus-aosp

* commit 'bff01c69cb84d9bf444edfb181b32b0240893aac':
  android-2.1_r1 snapshot