OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 15:30:08 +0000 (08:30 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 15:30:08 +0000 (08:30 -0700)
Change-Id: I5698914cf9093696ad851412a510a99419989d17


Trivial merge