OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:02:30 +0000 (11:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:02:30 +0000 (11:02 -0700)
commit07ba8effdeb89738523ffc7b71c6e5400092c437
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent16f60b78d4aec5df68fc5272db774ac8b89046f7
parent511be955d9acbff93d1b4a4b955384031c0330d5
merge from open-source master

Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e