OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 24 Aug 2010 04:44:11 +0000 (21:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 24 Aug 2010 04:44:11 +0000 (21:44 -0700)
Change-Id: Ic946a039fe4a5021549fe87bf2cbd11aa045ce39


Trivial merge