Rubin Xu d7d94666a3 Merge "Prompt to turn on/unlock profile before showing account sync settings" into nyc-mr1-dev am: 95089be460 am: e0cb0dc2c8 ...

am: 523c491662

Change-Id: I2501eca9be59fb354b825bef0d34cb79b81fdecf

2016-09-01 10:55:19 +00:00

res

resolve merge conflicts of d30af7c to master

2016-08-30 20:36:50 -07:00

src/com/android/settings

Prompt to turn on/unlock profile before showing account sync settings am: 3231afe95b am: e1237c8096

2016-09-01 10:55:18 +00:00

tests

Merge "Avoid JUnit4 collision in android-support-test, mockito-target"

2016-08-25 20:42:29 +00:00

Android.mk

Build with AAPT2

2016-08-17 10:19:00 -07:00

AndroidManifest.xml

Add label to redaction interstitial activity am: 05c38450e2

2016-08-30 00:00:15 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

proguard.flags

Keep classes/fields only used via reflection

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

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%