OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 00:13:34 +0000 (17:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 00:13:34 +0000 (17:13 -0700)
Change-Id: Iabc452eebbf351155e9886ae945cb18cc0a22ae0


Trivial merge