Colin Cross c5e5b64b04 Merge "Fix ManifestMerger issues" ...

am: 684b5f038b

Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256

2018-06-15 16:59:21 -07:00

..

res

Import translations. DO NOT MERGE

2018-05-31 19:29:24 -07:00

src/com/android/settingslib

Fix a calling loop for getAllUsers.

2018-06-05 11:47:40 -07:00

tests

Add default phone/sms to battery whitelist apps.

2018-05-29 22:30:49 +00:00

Android.mk

Merge "Fix ManifestMerger issues"

2018-06-15 16:59:21 -07:00

AndroidManifest.xml

…

common.mk

Migrate to AAPT2

2018-05-03 16:38:17 -07:00

OWNERS

…