Merge "Support profile guided compilation for secondary dex files" am: cb2e477f14...

author Calin Juravle <calin@google.com>

Fri, 17 Mar 2017 00:09:58 +0000 (00:09 +0000)

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

Fri, 17 Mar 2017 00:09:58 +0000 (00:09 +0000)
author Calin Juravle <calin@google.com>
Fri, 17 Mar 2017 00:09:58 +0000 (00:09 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 17 Mar 2017 00:09:58 +0000 (00:09 +0000)
diff --cc cmds/installd/InstalldNativeService.cpp
Simple merge
diff --cc cmds/installd/tests/installd_utils_test.cpp
Simple merge
diff --cc cmds/installd/utils.cpp
Simple merge
diff --cc cmds/installd/utils.h
Simple merge
author	Calin Juravle <calin@google.com>
	Fri, 17 Mar 2017 00:09:58 +0000 (00:09 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 17 Mar 2017 00:09:58 +0000 (00:09 +0000)
		1	2
cmds/installd/InstalldNativeService.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/installd/tests/installd_utils_test.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/installd/utils.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/installd/utils.h	patch \|	diff1 \|	diff2 \|	blob \| history