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