OSDN Git Service

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

* commit '5553de611a3a65dc5f2fa31d3c49b7f7a6609a36':
  android-2.1_r1 snapshot


Trivial merge