OSDN Git Service

Merge "Hide apps with NETWORK_SETTINGS from special wifi settings" into pi-dev am...
authorOscar Shu <xshu@google.com>
Thu, 26 Apr 2018 18:40:09 +0000 (11:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Apr 2018 18:40:09 +0000 (11:40 -0700)
am: 1635941c9a

Change-Id: Ic13938e0f4e876e3dfaea2049f2a7650b53fa8e1


Trivial merge