OSDN Git Service

Merge "Create a new NETWORK_SETTINGS permission" into oc-dev am: ed285e0cd6
authorRebecca Silberstein <silberst@google.com>
Wed, 10 May 2017 18:18:52 +0000 (18:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 May 2017 18:18:52 +0000 (18:18 +0000)
commit5985d027a1d411cc5a8f55518f0b8d33ca1f737d
treeebfcf04a6da27bc4bfc908b9631ca8c9ee21b7d7
parent907d05aa67348dfd2934ef95baddc2e26bf16071
parenta5b8380b035b6169b81ac0b536dcf90fba23d02f
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev am: ed285e0cd6
am: a5b8380b03

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