OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Sep 2010 03:25:17 +0000 (20:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Sep 2010 03:25:17 +0000 (20:25 -0700)
Change-Id: I1961157a504a5e8116c8c6a98f0b591922e534cf


Trivial merge