OSDN Git Service

Merge "Create a new NETWORK_SETTINGS permission" into oc-dev
authorRebecca Silberstein <silberst@google.com>
Wed, 10 May 2017 17:35:27 +0000 (17:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 May 2017 17:35:27 +0000 (17:35 +0000)
commita5b8380b035b6169b81ac0b536dcf90fba23d02f
tree46547074671b1b86f7ac3b3051888d42beb968d5
parentf92b4ec5b07adcf209f2ca4f90f8f3a698a890b3
parented285e0cd6c855f0450012249371c33c67d95f6f
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev
am: ed285e0cd6

Change-Id: Iae9b1317dc53a8213861ff3803764f9d45758f71
core/res/AndroidManifest.xml