Merge "Pass targetSdkVersion to installd" am: 106a915256 am: 77ba6baab5

author David Brazdil <dbrazdil@google.com>

Wed, 17 Jan 2018 14:26:05 +0000 (14:26 +0000)

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

Wed, 17 Jan 2018 14:26:05 +0000 (14:26 +0000)
author David Brazdil <dbrazdil@google.com>
Wed, 17 Jan 2018 14:26:05 +0000 (14:26 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 17 Jan 2018 14:26:05 +0000 (14:26 +0000)
diff --cc core/java/com/android/internal/os/ZygoteInit.java
Simple merge
diff --cc services/core/java/com/android/server/pm/Installer.java
Simple merge
diff --cc services/core/java/com/android/server/pm/OtaDexoptService.java
Simple merge
diff --cc services/core/java/com/android/server/pm/PackageDexOptimizer.java
Simple merge
author	David Brazdil <dbrazdil@google.com>
	Wed, 17 Jan 2018 14:26:05 +0000 (14:26 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 17 Jan 2018 14:26:05 +0000 (14:26 +0000)
		1	2
core/java/com/android/internal/os/ZygoteInit.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/Installer.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/OtaDexoptService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/pm/PackageDexOptimizer.java	patch \|	diff1 \|	diff2 \|	blob \| history