OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jul 2010 17:33:38 +0000 (10:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jul 2010 17:33:38 +0000 (10:33 -0700)
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571


Trivial merge