diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-01-23 03:58:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-23 03:58:12 +0000 |
| commit | 9ca9aace3dec926c8cc11a8d7d838ffdb0afed79 (patch) | |
| tree | 804af4bb7d081d006212c99facc9a862c0bf837f | |
| parent | 9ffad071a9956ba2603475b060f271900a4d2e26 (diff) | |
| parent | e03f2cb2c26d30c277d38566976bb4b00326d465 (diff) | |
| download | frameworks_base-9ca9aace3dec926c8cc11a8d7d838ffdb0afed79.zip frameworks_base-9ca9aace3dec926c8cc11a8d7d838ffdb0afed79.tar.gz frameworks_base-9ca9aace3dec926c8cc11a8d7d838ffdb0afed79.tar.bz2 | |
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev automerge: b443610 automerge: 83f58a2
automerge: e03f2cb
* commit 'e03f2cb2c26d30c277d38566976bb4b00326d465':
AAPT: Use the right enum when checking for density configurations
| -rw-r--r-- | tools/aapt/AaptConfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/AaptConfig.cpp b/tools/aapt/AaptConfig.cpp index e88c27a..ede9e99 100644 --- a/tools/aapt/AaptConfig.cpp +++ b/tools/aapt/AaptConfig.cpp @@ -796,7 +796,7 @@ bool isSameExcept(const ResTable_config& a, const ResTable_config& b, int axisMa } bool isDensityOnly(const ResTable_config& config) { - if (config.density == ResTable_config::DENSITY_NONE) { + if (config.density == ResTable_config::DENSITY_DEFAULT) { return false; } |