OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:37:13 +0000 (07:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:37:13 +0000 (07:37 -0700)
commitaebe000cfa26eb84031f7385bf363868a70f39ff
treed1ba5acdc469963fc946065a15db03e3bdda172d
parent4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf
parent8b676d191630ae484caad57c8d4c4325fc49da39
merge from open-source master

Change-Id: If08c1d42c870c8828b403ed322f3e93f07bb845a