Fan Zhang 9bb4e0b794 Merge "Set device credential's Window flag to be SECURE." into oc-dev ...

am: e3d0bbcc80  -s ours

Change-Id: I8be390dc1e5190029be41a55c014c9e2705c7aef

2017-10-31 18:36:12 +00:00

res

Import translations. DO NOT MERGE

2017-10-30 18:16:54 -07:00

src/com/android/settings

Merge "Set device credential's Window flag to be SECURE." into oc-dr1-dev

2017-10-31 02:37:43 +00:00

tests

Merge "Set device credential's Window flag to be SECURE." into oc-dr1-dev

2017-10-31 02:37:43 +00:00

Android.mk

Revert "Initial search bar implementation."

2017-06-06 17:30:17 +00:00

AndroidManifest.xml

resolve merge conflicts of 94c5202965 to oc-dr1-dev

2017-08-30 22:57:39 +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%