OSDN Git Service

merge from open-source froyo
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Jul 2010 18:38:12 +0000 (11:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Jul 2010 18:38:17 +0000 (11:38 -0700)
Change-Id: If4c03c5f5492deb0c99925e8097a8670061a3a2e


Trivial merge