OSDN Git Service

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


Trivial merge