OSDN Git Service

Merge from open-source froyo
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Jul 2010 22:38:41 +0000 (15:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Jul 2010 22:38:49 +0000 (15:38 -0700)
Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76


Trivial merge