OSDN Git Service

am 06998459: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:49:13 +0000 (08:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:49:13 +0000 (08:49 -0800)
Merge commit '0699845953d8a6d6ad52beaef39cd78fe04eefb8' into eclair-plus-aosp

* commit '0699845953d8a6d6ad52beaef39cd78fe04eefb8':
  android-2.1_r1 snapshot


Trivial merge