commit ed6db8766f5e2680eb38bcd5a36c02da509aba55
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 13 20:28:13 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 13 20:28:13 2020 +0000
tree 887b047a570c39858ab5a26bcc3a4250556747f2
parent f49fcbb6eea0d61ff2116ed869b0f116cf992a6b
parent 4c3b4106b61429d68cf049ee3030df8da4ce44d7

Merge "Track intent changes in frameworks/base" am: db9b2bfa95 am: 4c3b4106b6

Change-Id: Ibccc57bfed1884d44decf6bb06e28fd2dfa855af

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 34c67a4..3f24251 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,7 +34,6 @@
     <protected-broadcast android:name="android.intent.action.ANY_DATA_STATE" />
     <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.telephony.action.NETWORK_SET_TIME" />
     <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" />