OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 21:18:32 +0000 (14:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 21:18:32 +0000 (14:18 -0700)
Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95


Trivial merge