OSDN Git Service

am 8e2734af: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:46:19 +0000 (08:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:46:19 +0000 (08:46 -0800)
commitfa2de09c65fc50379eaffb22e71fb4b0474a3e22
tree6e91c87d7b088574f2c45c9da83f45194c6f7745
parent421bf12e09a569b81966c286cc7a7a6431a8b576
parent8e2734af47b25e9727c745d4eb7c42fef0cb19b4
am 8e2734af: reconcile main tree with open-source eclair

Merge commit '8e2734af47b25e9727c745d4eb7c42fef0cb19b4' into eclair-plus-aosp

* commit '8e2734af47b25e9727c745d4eb7c42fef0cb19b4':
  android-2.1_r1 snapshot