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)
commit92c9a6fe2e5a576de50d08e08a332a774f4cf2d4
tree0af558750b471f5a9dad3934b94cc174c09066d1
parent352926aa3a8ca45dae3e03a6e0ef6cc6b588e8df
parent5553de611a3a65dc5f2fa31d3c49b7f7a6609a36
am 5553de61: reconcile main tree with open-source eclair

Merge commit '5553de611a3a65dc5f2fa31d3c49b7f7a6609a36' into eclair-plus-aosp

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