Pavlin Radoslavov 8018f82e5a Merge "Use proper string formatting for the "Active device" string" ...

am: f5848d0f4d

Change-Id: Ic34959c5ca44ad6d0ac06dfb76b3b07cd4bee819

2018-02-10 09:12:16 +00:00

..

android

Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.

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

com/android

Merge "Use proper string formatting for the "Active device" string"

2018-02-10 09:12:16 +00:00