OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Dec 2010 23:17:08 +0000 (15:17 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Dec 2010 23:17:08 +0000 (15:17 -0800)
Change-Id: I90dfe6e962798b0004ef7a2837e737de32227a86


Trivial merge