Glen Kuhne 91aeed6f55 Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev ...

am: 85f59ff42d

Change-Id: I0812fdee8ad859cb7efb56f980de4ca00ce3f5a5

2017-10-12 19:02:55 +00:00

..

android

Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.

2017-09-08 16:11:36 +00:00

com/android

Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev

2017-10-12 19:02:55 +00:00