OSDN Git Service

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


Trivial merge