OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Oct 2010 18:45:09 +0000 (11:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Oct 2010 18:45:09 +0000 (11:45 -0700)
Change-Id: Ifd03cf004627f0a7d7eeb9665333016ef6d9de7a


Trivial merge