OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 18:36:35 +0000 (11:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 18:36:35 +0000 (11:36 -0700)
Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8


Trivial merge