Marie Janssen 9787d19947 resolve merge conflicts of 1c98d85cf6 to master ...

Change-Id: Ie4401bf35d4a56865faa5476b86b2a384ad21231

2017-01-30 10:21:05 -08:00

res

Merge "Add a screen to show OEM backup settings."

2017-01-30 16:39:42 +00:00

src/com/android/settings

resolve merge conflicts of 1c98d85cf6 to master

2017-01-30 10:21:05 -08:00

tests

Merge "Add a screen to show OEM backup settings."

2017-01-30 16:39:42 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

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

AndroidManifest.xml

resolve merge conflicts of 1c98d85cf6 to master

2017-01-30 10:21:05 -08: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%