OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 1 Oct 2010 21:16:05 +0000 (14:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 1 Oct 2010 21:16:05 +0000 (14:16 -0700)
commitae3af4c259bf50906dbb6dfe02dcf9a9067f154f
tree6413496657e678938bf677fe137c24f6c9b9b9fc
parent2c8fbcb45671043fdfe1fc8bcda6b8603c298e61
parentc11cb3e9927e67c40ed2c239aa53125e6ace4400
merge from open-source master

Change-Id: Ib9a3c29118ca3b933295fa7c917c938fd26fa930