OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Apr 2010 16:10:10 +0000 (09:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Apr 2010 16:10:10 +0000 (09:10 -0700)
Change-Id: Ia811827c7fce6b14ec6f8f9dc5f5305be6138127


Trivial merge