OSDN Git Service

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


Trivial merge