OSDN Git Service

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


Trivial merge