summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-01-08 20:24:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-08 20:24:33 +0000
commit6e2eb2df4cb8ca4d0eeda0fb38e1a67136a0d275 (patch)
tree70a3dcfd3dbcf71862d24153c390ff1db5a44e34 /tools
parent0e2fdb43122c53c3a63bc3810c93c30083d92866 (diff)
parentc04a21a0ef6cd97a45307e4c1de9088e57719ca2 (diff)
downloadframeworks_base-6e2eb2df4cb8ca4d0eeda0fb38e1a67136a0d275.zip
frameworks_base-6e2eb2df4cb8ca4d0eeda0fb38e1a67136a0d275.tar.gz
frameworks_base-6e2eb2df4cb8ca4d0eeda0fb38e1a67136a0d275.tar.bz2
am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0
* commit 'c04a21a0ef6cd97a45307e4c1de9088e57719ca2': Fixup aapt usage message
Diffstat (limited to 'tools')
-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 18b8e1e..8b416aa 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"