Fan Zhang 616da3bdab Merge "Apply admin restriction when network reset is disallowed" into oc-dev am: 08575e1149 ...

am: f3ce205b86

Change-Id: Id0da20ed2242becd2a5fad8d9bfd85a688ddee38

2017-04-14 21:22:26 +00:00

..

android/settings

Merge "Apply admin restriction when network reset is disallowed" into oc-dev am: 08575e1149

2017-04-14 21:22:26 +00:00