OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 17 Nov 2010 20:06:44 +0000 (12:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 17 Nov 2010 20:06:44 +0000 (12:06 -0800)
Change-Id: Ide21ec65f1912807b11d016579747f647aa90950


Trivial merge