OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 23:05:42 +0000 (15:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 23:05:42 +0000 (15:05 -0800)
Change-Id: I9316d9dc8a881072f409f72f816bcc89bfb76910


Trivial merge