OSDN Git Service

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


Trivial merge