OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Jul 2010 20:06:31 +0000 (13:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Jul 2010 20:06:31 +0000 (13:06 -0700)
commit35003ca8aeb0d007efedc87ef0f2a9558294d4fa
treef9531885fbcc8b8f8304bab9ccdf2a0b892ad78f
parentd88bff8f5384285f76576eb7707c6d9d5b98edb6
parentc0527a2884391e611fac83133c453e27b34cce8f
merge from open-source master

Change-Id: I8c23f6f2bf984f794758ec27700d5fed4548ac09