OSDN Git Service

Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
authorRoshan Pius <rpius@google.com>
Tue, 25 Jul 2017 20:56:33 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 20:56:33 +0000 (20:56 +0000)
am: 2b689e63ca  -s ours

Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c


Trivial merge