Merge "Add system API for whether emergency assistance is enabled."

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

Thu, 21 Mar 2019 23:03:33 +0000 (23:03 +0000)

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

Thu, 21 Mar 2019 23:03:33 +0000 (23:03 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 21 Mar 2019 23:03:33 +0000 (23:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 21 Mar 2019 23:03:33 +0000 (23:03 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc data/etc/privapp-permissions-platform.xml
Simple merge
diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 21 Mar 2019 23:03:33 +0000 (23:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 21 Mar 2019 23:03:33 +0000 (23:03 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
data/etc/privapp-permissions-platform.xml	patch \|	diff1 \|	diff2 \|	blob \| history
telephony/java/android/telephony/TelephonyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history