tree b29af36969ddab08045a42d076ac06e2024074a6
parent 02ebcdb91101020f1897d50ed6d2e7ad048a5cec
parent 4045d24971fea4f1506ac8f16d4deeb76ac415fe
author Zoltan Szatmary-Ban <szatmz@google.com> 1435049075 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435049089 +0000

Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev