OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:06:33 +0000 (11:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:06:33 +0000 (11:06 -0700)
commitf7ac9f5f68a0836e1580520759e529b21893aeb8
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent07ba8effdeb89738523ffc7b71c6e5400092c437
parentac3e5138d6d965518e68aa3d41f4b47e04d01cf6
merge from open-source master

Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2