OSDN Git Service

Merge "Don't hide network reset even if it's disabled by admin." into oc-dev
authorFan Zhang <zhfan@google.com>
Sat, 29 Apr 2017 06:58:11 +0000 (06:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Apr 2017 06:58:11 +0000 (06:58 +0000)
commit5acb03575faf8e98ddddd22cc9df2490aa34a02e
tree72970278195122685bfbd1d71343f8aae837cf2f
parentae112c8a4697b3701f6f09b348a4c2e2240ef408
parentb50460086dc9ac725bff50bec00566e0b3eb0e42
Merge "Don't hide network reset even if it's disabled by admin." into oc-dev
am: b50460086d

Change-Id: I3d1a1958999aed60b44da454f341ed711a64a589