Dmitry Dementyev 5e2545c3e6 resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9 am: b7e2545217 am: def3eddb43 am: 3964c51bf2 -s ours am: f1fb452863 am: 2569925151 am: efb9f74486 am: d5f3ae5cac am: 0fb3d55e3a ...

am: dd48f602bb

Change-Id: I69d192ea59bd5c2b79abd513e88aecc78a0d6980

2017-03-09 18:35:40 +00:00

res

Merge "Update layout and strings for DO Disclosures"

2017-03-09 12:33:06 +00:00

src/com/android/settings

Merge "Initialize injected Security preferences."

2017-03-09 17:08:11 +00:00

tests

Merge "Initialize injected Security preferences."

2017-03-09 17:08:11 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

2016-12-16 14:11:02 -08:00

AndroidManifest.xml

Merge "Update layout and strings for DO Disclosures"

2017-03-09 12:33:06 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

PREUPLOAD.cfg

Point to the new checkstyle location for packages/apps/Settings PREUPLOAD hook.

2016-12-15 15:06:04 -08:00

proguard.flags

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +00:00

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%