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)
Merge commit 'b7deec2514dfa9b0c8a67df340023f16c8ef0f7a' into eclair-plus-aosp

* commit 'b7deec2514dfa9b0c8a67df340023f16c8ef0f7a':
  android-2.1_r1 snapshot


Trivial merge