OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 4 Sep 2010 00:12:30 +0000 (17:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 4 Sep 2010 00:12:30 +0000 (17:12 -0700)
Change-Id: I9d7eca2a536b4646767a7aa1afba2d86b865fb57


Trivial merge