OSDN Git Service

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


Trivial merge