Merge "Add logic for passing down CompactDex generation flag" am: b5fb7e91d8

author Mathieu Chartier <mathieuc@google.com>

Wed, 7 Mar 2018 21:37:22 +0000 (21:37 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 7 Mar 2018 21:37:22 +0000 (21:37 +0000)
author Mathieu Chartier <mathieuc@google.com>
Wed, 7 Mar 2018 21:37:22 +0000 (21:37 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 7 Mar 2018 21:37:22 +0000 (21:37 +0000)
diff --cc services/core/java/com/android/server/pm/Installer.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageDexOptimizer.java
Simple merge
author	Mathieu Chartier <mathieuc@google.com>
	Wed, 7 Mar 2018 21:37:22 +0000 (21:37 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 7 Mar 2018 21:37:22 +0000 (21:37 +0000)
		1	2
services/core/java/com/android/server/pm/Installer.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageDexOptimizer.java	patch \|	diff1 \|	diff2 \|	blob \| history