OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 23:04:59 +0000 (15:04 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Nov 2010 23:04:59 +0000 (15:04 -0800)
Change-Id: Ife0027c5b18435f5188202f801ef49e31cd5c01a


Trivial merge