OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:22:11 +0000 (07:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:22:11 +0000 (07:22 -0700)
Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650


Trivial merge