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)
am: a5b8380b03

Change-Id: I1fab5a10644d7f24a304e24f373461c72c03d9a6

1  2 
core/res/AndroidManifest.xml

Simple merge