Dmitry Dementyev 4ea31956fb resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec am: 3b5b2d6d20 am: c28fb3e071 am: 5330df501f ...

am: 7a3593cbc6  -s ours

Change-Id: Iab4a431d43dade3cbe26b5be7e4166f090a26d2e

2017-03-09 18:35:27 +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

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%