OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:30:52 +0000 (16:30 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:30:52 +0000 (16:30 -0700)
Change-Id: Ia3b88d1fc8864903dd67478e972758871730a215


Trivial merge