OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Mar 2010 18:13:47 +0000 (11:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 30 Mar 2010 18:13:47 +0000 (11:13 -0700)
Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525


Trivial merge