OSDN Git Service

Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689...
authorRoshan Pius <rpius@google.com>
Tue, 25 Jul 2017 21:01:25 +0000 (21:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 21:01:25 +0000 (21:01 +0000)
commite71f1bc007e44842d0cf13e18d5a8f2206a281dc
tree36a6fa30e44ef616dec60c1243ad2cdf3ea850ff
parent716d4b216277a4dc238ff990f4565f72ed7a9f77
parent096e14d92f3800d53ae3da60c3c4b84157e8b73d
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca  -s ours
am: 096e14d92f  -s ours

Change-Id: I1bec0f5ef17946fa49cdd2aa36ebc51f3d3c1d23