Commit e03f2cb2 authored Jan 23, 2015 by Adam Lesinski Committed by android-build-merger Jan 23, 2015

Merge "AAPT: Use the right enum when checking for density configurations" into...

Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev automerge: b443610b
automerge: 83f58a2f

* commit '83f58a2f':
  AAPT: Use the right enum when checking for density configurations

parents 92baed12 83f58a2f

tools/aapt/AaptConfig.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}