OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 02:10:13 +0000 (18:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 02:10:13 +0000 (18:10 -0800)
Change-Id: Ib8ef5125a7206364770f9b28a5923843ed7898a5


Trivial merge