OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Oct 2010 18:03:48 +0000 (11:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Oct 2010 18:03:48 +0000 (11:03 -0700)
Change-Id: I40792602007ee77f51b8d4cfcf1ab1daced63785


Trivial merge