OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 04:57:09 +0000 (20:57 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 04:57:09 +0000 (20:57 -0800)
commitf25d9fac87348504dc70ce7700da3a9fab3d928c
treeeeb85bcda341477d30c5ff814ad46d47fcf23b7c
parent7bc477ba2e20b62e4d614d3aa2a8054b2daa7fb6
parent760c9781599d751ab375981a197177ffe1ab8d7d
merge from open-source master

Change-Id: I66a3b8c183bee0f8efc86f53a7dfd9004ed75867