提交: 6a691b3ed872ed42d83ef52a0f975cfc5b3c638a - development (git)

development

Commit MetaInfo

• 修訂: 6a691b3ed872ed42d83ef52a0f975cfc5b3c638a (tree)
• 時間: 2011-01-28 14:46:19
• 作者: Raphael <raphael@goog...>
• Commiter: Raphael

Log Message

resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp

Change-Id: I6c2ea537a9f6dce3c5d54b8c3c720b49058fea68

Change Summary

• modified: build/tools/patch_windows_sdk.sh

差異

--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -30,7 +30,7 @@ WIN_OUT_DIR=$2
 TOPDIR=${TOPDIR:-$3}
 
 # The unix2dos is provided by the APT package "tofrodos". However
-# as for ubuntu lucid, the package renamed the command to "todos".
+# as of ubuntu lucid, the package renamed the command to "todos".
 UNIX2DOS=`which unix2dos`
 if [[ ! -x $UNIX2DOS ]]; then
   UNIX2DOS=`which todos`
@@ -111,3 +111,4 @@ ${TOPDIR}sdk/build/patch_windows_sdk.sh $Q ${TEMP_SDK_DIR} ${WIN_OUT_DIR} ${TOPD
 for i in fastboot.exe adb.exe AdbWinApi.dll AdbWinUsbApi.dll; do
     cp -f $V $WIN_OUT_DIR/host/windows-x86/bin/$i $TEMP_SDK_DIR/../$i
 done
+