Merge "Rename fsi_boot to dex_boot and the flag names"

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 30 Jan 2019 17:26:51 +0000 (17:26 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 30 Jan 2019 17:26:51 +0000 (17:26 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 30 Jan 2019 17:26:51 +0000 (17:26 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 30 Jan 2019 17:26:51 +0000 (17:26 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/provider/DeviceConfig.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 30 Jan 2019 17:26:51 +0000 (17:26 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 30 Jan 2019 17:26:51 +0000 (17:26 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/DeviceConfig.java	patch \|	diff1 \|	diff2 \|	blob \| history