Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am: 2b689e63ca
-s ours
Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c
This commit is contained in:
am: 2b689e63ca
-s ours
Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c