OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 17:54:40 +0000 (10:54 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 17:54:40 +0000 (10:54 -0700)
Change-Id: I03cb4a4df5c37815c5ca547de59f983bd458afcf


Trivial merge