OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Dec 2010 00:11:39 +0000 (16:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Dec 2010 00:11:39 +0000 (16:11 -0800)
Change-Id: I340b8fffb994f785620bae62f4d63afb9b9529e2


Trivial merge