OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 17:47:23 +0000 (10:47 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 17:47:23 +0000 (10:47 -0700)
commit611793d6abcf504544d6ebccb8c46da06464b701
tree5ff851ee3dca32f3d8c4c17e3ba15e4d1796fb5e
parentea5adb571e664e5d0444230169062baaa996686f
parent16984423bc67cd334d74b585bac2c01e44583624
merge from open-source master

Change-Id: Ia22080192681c2ac596582d6cfdac732b1ff4c9f