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)
commit096e14d92f3800d53ae3da60c3c4b84157e8b73d
tree0cc11da4f18bee4679ff447b8c517350fad0fa9a
parent2e70aea7420b6ace7ac9e766c1e1732bdb1fb508
parent2b689e63cace5c04115593113c5cd5fe1e9f3d30
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am: 2b689e63ca  -s ours

Change-Id: Ifb8441b5cb1554ac94dde28ae247596cdf810e6c