OSDN Git Service

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


Trivial merge