OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 16:03:32 +0000 (09:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 16:03:32 +0000 (09:03 -0700)
commit5cbd5d9ff446f9d677ad4eabbdc019942cc84b6a
tree93d3a690a7e0cb87971a19978badeb0b7a28853a
parent290f527297f655d1fd76522b253681fb4aad4a7f
parent633c4a5094a1af71b88ff9a325eb6b52a1ee568e
merge from open-source master

Change-Id: I058f809f7e7eb69a757cb75f934a3630dfd7d777