OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:48:15 +0000 (11:48 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:48:15 +0000 (11:48 -0700)
Change-Id: I6c6ee9c9567f5aef7e1beb585296c1e2fb884e9a


Trivial merge