Zach Jang 825518b7b9 am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 ...

* commit '2ead093496c3b5b266c21a483c4f0c37869d57de':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

2015-09-21 21:37:14 +00:00

res

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

2015-09-19 02:35:07 +00:00

src/com/android/settings

Merge "Revert "Remove don't kill flag from CryptKeeper to stop logspam"" into mnc-dr-dev

2015-09-19 02:32:23 +00:00

tests

Import translations. DO NOT MERGE

2015-09-18 10:37:08 -07:00

Android.mk

Allow incremental builds for settings.

2015-04-27 21:16:03 +00:00

AndroidManifest.xml

Finish trampoline activity for ConfirmDeviceCredential immediately

2015-09-10 20:14:06 -07:00

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

…

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%