OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 21:25:48 +0000 (14:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 21:25:48 +0000 (14:25 -0700)
Change-Id: I94b7bb82473b1d4fcb5439d8e6e478b50d83c00f


Trivial merge