commit 0e330529b2be5ece662b2e7ecd9acdf3e759d87a
author Jeff Sharkey <jsharkey@android.com> Tue Apr 12 17:07:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 12 17:07:40 2016 +0000
tree f702c574e3a8186cac21c8939acc81fcffb9236a
parent 51057aa3edd4463eed1997147305218f498154ed
parent a6e38e4430a085f13323e32bd211f99a4110d42a

Merge "Another protected broadcast." into nyc-dev
am: a6e38e4

* commit 'a6e38e4430a085f13323e32bd211f99a4110d42a':
  Another protected broadcast.

Change-Id: I66b68d33318da7582c82beb776fdc93fd73f3c7a

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9a2e39c7..778f797 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -420,6 +420,7 @@
     <protected-broadcast android:name="android.os.storage.action.VOLUME_STATE_CHANGED" />
     <protected-broadcast android:name="android.os.storage.action.DISK_SCANNED" />
     <protected-broadcast android:name="com.android.server.action.UPDATE_TWILIGHT_STATE" />
+    <protected-broadcast android:name="com.android.server.action.RESET_TWILIGHT_AUTO" />
     <protected-broadcast android:name="com.android.server.device_idle.STEP_IDLE_STATE" />
     <protected-broadcast android:name="com.android.server.device_idle.STEP_LIGHT_IDLE_STATE" />
     <protected-broadcast android:name="com.android.server.Wifi.action.TOGGLE_PNO" />