Kevin Chyn de57cea3c3 resolve merge conflicts of 2c712acefa to master ...

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

2019-09-26 21:09:25 -07:00

..

res

Add Aware Lock Settings

2019-05-15 19:14:43 +08:00

src

Remove unused package_verifier_state setting.

2019-09-24 15:56:08 +01:00

test

resolve merge conflicts of 2c712acefa to master

2019-09-26 21:09:25 -07:00

Android.bp

Move the list of settings to backup out of the Settings class

2019-08-28 14:51:20 +01:00

AndroidManifest.xml

Makes settings provider queryable by all

2019-08-08 10:35:27 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

TEST_MAPPING

Sprinkle in some TEST_MAPPING.

2019-08-28 16:13:19 -06:00