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)
am: 0b302499cd

Change-Id: I1cd33b35066d2dfa4b349dc163a2a16f7f0a123b


Trivial merge