commit 1c610438767f391ba2938d25328c3cb931f25b9f
author Tyler Gunn <tgunn@google.com> Thu Dec 10 20:03:24 2015 -0800
committer Tyler Gunn <tgunn@google.com> Thu Dec 10 20:03:24 2015 -0800
tree f5723aebe0f200cdaf9fe68792e18658ce229e04
parent abc571c640e83d2c33caf3c44ba4b0666d6b584d
parent bc4da97ce0fcd0ddef228048bc663e383776c323

Merge commit 'bc4da97ce0fcd0ddef228048bc663e383776c323' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 1c1b2b0..29044a1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32825,7 +32825,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";