OSDN Git Service

Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
authorOscar Shu <xshu@google.com>
Thu, 26 Apr 2018 18:25:15 +0000 (11:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Apr 2018 18:25:15 +0000 (11:25 -0700)
commit1635941c9aaf7d23af994e9223aace305dcbc549
treec0441b9d02c6f653f656eb0ed53bdc54fd96a97c
parent7b0651b63f5edd8ecfbbf58595d7d142b5592db9
parent0b302499cd90f1ba0267c4afa2c915f5d37bec1a
Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev
am: 0b302499cd

Change-Id: I1cd33b35066d2dfa4b349dc163a2a16f7f0a123b