Adam Lesinski 4d29c66930 Merge commit 'fa31eb2c' into manualmerge ...

Conflicts:
	tools/split-select/RuleGenerator_test.cpp

Change-Id: I0d1261301d433f32e857cf1b0d75a861205f7625

2014-11-10 14:32:11 -08:00

..

Abi.cpp

…

Abi.h

…

Android.mk

split-select: Fix rules generated for anydpi density

2014-11-06 14:57:34 -08:00

Grouper_test.cpp

…

Grouper.cpp

…

Grouper.h

…

Main.cpp

…

Rule_test.cpp

split-select: Fix rules generated for anydpi density

2014-11-06 14:57:34 -08:00

Rule.cpp

split-select: Fix rules generated for anydpi density

2014-11-06 14:57:34 -08:00

Rule.h

split-select: Fix rules generated for anydpi density

2014-11-06 14:57:34 -08:00

RuleGenerator_test.cpp

Merge commit 'fa31eb2c' into manualmerge

2014-11-10 14:32:11 -08:00

RuleGenerator.cpp

Merge commit 'fa31eb2c' into manualmerge

2014-11-10 14:32:11 -08:00

RuleGenerator.h

…

SplitDescription.cpp

…

SplitDescription.h

…

TestRules.cpp

split-select: Fix rules generated for anydpi density

2014-11-06 14:57:34 -08:00

TestRules.h

split-select: Fix rules generated for anydpi density

2014-11-06 14:57:34 -08:00