OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 21:33:10 +0000 (14:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 21:33:10 +0000 (14:33 -0700)
Change-Id: I7fd0fd51666489afe7e4645d2ec4970acbb0b4a9


Trivial merge