OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Sep 2010 06:12:49 +0000 (23:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Sep 2010 06:12:49 +0000 (23:12 -0700)
Change-Id: I7b1a186d7e1d469d873d1f0a63acfa9cb404da0a


Trivial merge