Valentin Iftime 67d9805fed resolve merge conflicts of 484e166df3 to master ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia9db1400207d9196012362c480ede059e94184af

2019-10-08 22:21:44 +02:00

..

Android.bp

Android.bp file to convert current.api to XML format.

2019-08-15 09:43:47 -07:00

current.txt

resolve merge conflicts of 484e166df3 to master

2019-10-08 22:21:44 +02:00

removed.txt

Merge "Removing @Deprecated && @removed method from KeyguardManager."

2019-08-29 20:32:46 +00:00

system-current.txt

Merge "Make isDataEnabledForApn() a system api."

2019-10-08 01:54:10 +00:00

system-removed.txt

Remove @Deprecated && @removed methods from DevicePolicyManager.

2019-07-09 14:30:48 -07:00

TEST_MAPPING

Change the test mapping configuration of GTS modules by using "imports."

2019-04-19 13:56:19 +00:00

test-current.txt

Merge "Optimize UserHandle.of()"

2019-10-07 21:33:51 +00:00

test-removed.txt

Remove OnPropertyChangedListener.

2019-05-31 12:47:49 -07:00