commit d4f580fb936851a42d1f83de2f9a088d5d6315cb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 12 19:34:23 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 12 19:34:23 2019 +0000
tree 8b547afccad9edf5bebabf389bf30b09d13ad40b
parent b5cae40bc62ad5bb80df3045e35cebddd4e0c92d
parent 026efc3bb7a5a31584684c766ac564a8b4d1955b

Merge "Remove NETWORK_SET_TIMEZONE broadcast" am: 1bfb17e370 am: f50abb1ce5 am: 026efc3bb7

Change-Id: I363b596452316574fe748fb6b087246784f36a35

client/AndroidManifest.xml

diff --git a/client/AndroidManifest.xml b/client/AndroidManifest.xml
index db3bb45..5f3a9e1 100644
--- a/client/AndroidManifest.xml
+++ b/client/AndroidManifest.xml
@@ -36,7 +36,6 @@
     <protected-broadcast android:name="android.intent.action.DATA_STALL_DETECTED" />
     <protected-broadcast android:name="android.intent.action.SIM_STATE_CHANGED" />
     <protected-broadcast android:name="android.intent.action.NETWORK_SET_TIME" />
-    <protected-broadcast android:name="android.intent.action.NETWORK_SET_TIMEZONE" />
     <protected-broadcast android:name="com.android.internal.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" />
     <protected-broadcast android:name="android.intent.action.ACTION_MDN_STATE_CHANGED" />
     <protected-broadcast android:name="android.provider.Telephony.SPN_STRINGS_UPDATED" />