OSDN Git Service

am b7deec25: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:48:08 +0000 (08:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:48:08 +0000 (08:48 -0800)
commit2e5401ff6a2fcd6978adf1d2895935a42e1990bf
tree845521c0d3c158b474499679de2a83fc9119ca9d
parentbd213eb273952e1c1bb05fc4f07422e923b526f2
parentb7deec2514dfa9b0c8a67df340023f16c8ef0f7a
am b7deec25: reconcile main tree with open-source eclair

Merge commit 'b7deec2514dfa9b0c8a67df340023f16c8ef0f7a' into eclair-plus-aosp

* commit 'b7deec2514dfa9b0c8a67df340023f16c8ef0f7a':
  android-2.1_r1 snapshot