Merge "Add dedicated flag to control app image generation" into pi-dev

author Mathieu Chartier <mathieuc@google.com>

Tue, 3 Apr 2018 16:26:41 +0000 (09:26 -0700)

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

Tue, 3 Apr 2018 16:26:41 +0000 (09:26 -0700)
author Mathieu Chartier <mathieuc@google.com>
Tue, 3 Apr 2018 16:26:41 +0000 (09:26 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 16:26:41 +0000 (09:26 -0700)
diff --cc services/core/java/com/android/server/pm/Installer.java
Simple merge
author	Mathieu Chartier <mathieuc@google.com>
	Tue, 3 Apr 2018 16:26:41 +0000 (09:26 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 3 Apr 2018 16:26:41 +0000 (09:26 -0700)