OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Aug 2010 23:07:39 +0000 (16:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Aug 2010 23:07:39 +0000 (16:07 -0700)
Change-Id: I97ab7062e558756b01eddbdcb058b4e451b7722d


Trivial merge