Skip to content
Commit 3f5478a3 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes I121b9246,Ib8227067 

* changes:
  AndroidManifest.xml: Mark NETWORK_SETTINGS_RESET broadcast as protected
  Intent: Promote broadcast flag needed by wifi to @SystemApi
parents 40d1c39d 6769c541
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment