OSDN Git Service

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


Trivial merge