OSDN Git Service

Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
authorCharles He <qiurui@google.com>
Wed, 6 Sep 2017 16:06:32 +0000 (16:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 16:06:32 +0000 (16:06 +0000)
am: 10adff1163

Change-Id: I8aed4d127bc84c457a672cc5e524aa7ac477b15d


Trivial merge