OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 May 2010 17:56:24 +0000 (10:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 May 2010 17:56:24 +0000 (10:56 -0700)
commit253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b
tree70e2742ac0c0d25af95f6cf23a915a51d7b01689
parentc043a97c9f3e1a2c8b5a95df70b89c711a1087ce
parentec867a8c35b48dfe4439cf4160e2a25a15946768
merge from open-source master

Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41