OSDN Git Service

am 8916d261: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:46:16 +0000 (08:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:46:16 +0000 (08:46 -0800)
commit0341ac9aa9f48d71e10d8b1a7382a4ee75fbe3e2
treeab1ad06d81ef122581a300f642f0de01a50d3086
parentac1140f71690c537a0a318446731611341e163b8
parent8916d261ab985d191999ec9f8751819434ec4cc0
am 8916d261: reconcile main tree with open-source eclair

Merge commit '8916d261ab985d191999ec9f8751819434ec4cc0' into eclair-plus-aosp

* commit '8916d261ab985d191999ec9f8751819434ec4cc0':
  android-2.1_r1 snapshot