OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 22:55:52 +0000 (15:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 22:55:52 +0000 (15:55 -0700)
Change-Id: Ie00f88eb12c81dc3736caa43393428c42b871e7c


Trivial merge