OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Oct 2010 22:22:43 +0000 (15:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Oct 2010 22:22:43 +0000 (15:22 -0700)
Change-Id: I0b65c8c5425024aec3817848410a88e474d87b00


Trivial merge