OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:07:32 +0000 (11:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:07:32 +0000 (11:07 -0700)
commit5c4c784bd7f5e7c678ac6d8312f11f65b9be7003
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parentf7ac9f5f68a0836e1580520759e529b21893aeb8
parent9cff675dcd1eee60c5e44f96d69a49d4e8aade66
merge from open-source master

Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c