OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)
commit57e32fb1cef99fb8b1359b90a0aeff77a66be6d1
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent002415834bd7b541c78f3acd0cd8ad70becffdca
parent56d23925eddcfe9fa646aad04c274a97d8b5ed3f
merge from open-source master

Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861