resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

[android/aapt.git] / Main.cpp

diff --git a/Main.cpp b/Main.cpp
index 8edb5b53b194c96cddad9efcbbf4fad44add09af..9887268abd7e51662aed3b0934e207303cd39001 100644 (file)
--- a/Main.cpp
+++ b/Main.cpp
@@ -148,7 +148,7 @@ void usage(void)
         "   --extra-packages\n"
         "       generate R.java for libraries. Separate libraries with ':'.\n"
         "   --generate-dependencies\n"
-        "       generate a dependency file for R.java.\n"
+        "       generate dependency files in the same directories for R.java and resource package\n"
         "   --auto-add-overlay\n"
         "       Automatically add resources that are only in overlays.\n"
         "   --rename-manifest-package\n"