OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 May 2010 23:16:09 +0000 (16:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 May 2010 23:16:09 +0000 (16:16 -0700)
Change-Id: I323b3e716af939a3307189e694f4cdb83b4eda80


Trivial merge