OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:44:48 +0000 (07:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:44:48 +0000 (07:44 -0700)
commit2d75ee4ad0034d81350602567b8d76b1278e7edc
tree9e409e6d1b58554edcfc0ef2dad8e30e13a21445
parentaebe000cfa26eb84031f7385bf363868a70f39ff
parent91cd2770601d03ba8e1221bf7f39107accb76492
merge from open-source master

Change-Id: I69d4b5355019fa58ef5a00e6f53e553ea71f2f90