OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 5 Oct 2010 18:20:13 +0000 (11:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 5 Oct 2010 18:20:13 +0000 (11:20 -0700)
Change-Id: I5db2a38f681d2168dfb801d6ad9a4a1243d3edba


Trivial merge