Jayachandran C 82e53b725a Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 337df70e17 am: 0a86ee3b3e ...

am: 78f84d5abe

Change-Id: I24e2c0c353f9e74a65c2e3d24a43338022b3efc4

2019-11-15 22:25:23 -08:00

..

java/com/android/server/devicepolicy

Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 337df70e17 am: 0a86ee3b3e

2019-11-15 22:25:23 -08:00

Android.bp

resolve merge conflicts of 8e8c40b5c2 to master

2019-11-13 17:21:20 +00:00

TEST_MAPPING

Move CtsDevicePolicyManagerTestCases to its own group

2019-10-04 22:45:39 -07:00