OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 May 2010 22:16:56 +0000 (15:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 May 2010 22:16:56 +0000 (15:16 -0700)
Change-Id: Ie06ab3b2424480706c644f1a803a6e3de400f15d


Trivial merge