commit aa5c2c93036ec4b5ad5d0e7583c748f77270b08c
author Tyler Gunn <tgunn@google.com> Fri Dec 04 21:04:20 2015 -0800
committer Tyler Gunn <tgunn@google.com> Fri Dec 04 21:04:20 2015 -0800
tree 89c8058663007c3616c2f916cf6719e655bb9258
parent a16144359a1d8f3d4aa3800f7ce29ce115921db5
parent bc4da97ce0fcd0ddef228048bc663e383776c323

Merge commit 'bc4da97ce0fcd0ddef228048bc663e383776c323' into tgunn-mncvtdev-to-master-2015-12-04

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index fa588cd..8128819 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -37391,7 +37391,7 @@
     method public void notifyConfigChangedForSubId(int);
     method public void updateConfigForPhoneId(int, java.lang.String);
     field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
-    final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";
+    field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";
     field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause";
     field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
     field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";