summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-01-08 20:18:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-08 20:18:38 +0000
commitc04a21a0ef6cd97a45307e4c1de9088e57719ca2 (patch)
treea17ce6a4ba7be16da306af1b882ab8cbcb106a24 /tools/aapt
parent387da7769757ab6368acb2a0000cd8a85d3e55d8 (diff)
parent64044d0b7bc9aa46c60adcadce699d556e1c608e (diff)
downloadframeworks_base-c04a21a0ef6cd97a45307e4c1de9088e57719ca2.zip
frameworks_base-c04a21a0ef6cd97a45307e4c1de9088e57719ca2.tar.gz
frameworks_base-c04a21a0ef6cd97a45307e4c1de9088e57719ca2.tar.bz2
Merge "Fixup aapt usage message"
automerge: 64044d0 * commit '64044d0b7bc9aa46c60adcadce699d556e1c608e': Fixup aapt usage message
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/Main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp
index 2857b59..4ce4b2c 100644
--- a/tools/aapt/Main.cpp
+++ b/tools/aapt/Main.cpp
@@ -69,7 +69,7 @@ void usage(void)
" [-S resource-sources [-S resource-sources ...]] \\\n"
" [-F apk-file] [-J R-file-dir] \\\n"
" [--product product1,product2,...] \\\n"
- " [-c CONFIGS] [--preferred-configurations CONFIGS] \\\n"
+ " [-c CONFIGS] [--preferred-density DENSITY] \\\n"
" [--split CONFIGS [--split CONFIGS]] \\\n"
" [--feature-of package [--feature-after package]] \\\n"
" [raw-files-dir [raw-files-dir] ...] \\\n"