OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Nov 2010 00:10:41 +0000 (16:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Nov 2010 00:10:41 +0000 (16:10 -0800)
commit28da852d03a3201654e3dad2a81cb1da6f4e288f
tree5feac6d63f4754b96668b288409fd6866b221ee8
parentae51f668c51f9c0830e88f204232cb41d7920fc1
parentaa6baa738c60b74a540130f105e6d7146f79c600
merge from open-source master

Change-Id: Ie58d6e47c7024135b097279b2e33d66a86c4d5a5