OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 18 Oct 2010 21:52:30 +0000 (14:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 18 Oct 2010 21:52:30 +0000 (14:52 -0700)
Change-Id: Icdc85324836d6ff5674ff6d391292e331b290679


Trivial merge