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:06:25 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 21:06:25 +0000 (21:06 +0000)
commit7952871e181038ce0e42c6f9ac3dd96ddc64bae5
tree36a6fa30e44ef616dec60c1243ad2cdf3ea850ff
parente71f1bc007e44842d0cf13e18d5a8f2206a281dc
parent974920af47101b91bca3a03ce3d3d6377a5b3187
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca
am: 974920af47  -s ours

Change-Id: Ib44b99d0d8804de60948929c4c6fc5e7d9c55cd5