OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 20 Nov 2010 00:32:05 +0000 (16:32 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 20 Nov 2010 00:32:05 +0000 (16:32 -0800)
Change-Id: Ib80d4267e4667901e852a03da42a7f6cc418f116


Trivial merge