Fan Zhang 1b1204be64 Merge "Set device credential's Window flag to be SECURE." into mnc-dev am: 8bffdc2613 am: cd66862b08 am: 769e1e31f5 am: b4db530aa5 -s ours am: 0c0728a947 -s ours am: 4d9e11990d -s ours am: 3d94477fb8 -s ours am: 9d865d0c3e -s ours am: 7da421a293 -s ours ...

am: 76f30a360c  -s ours

Change-Id: Ib2f57e3bd9adc14be453af9fc510613d210ffe23

2017-10-31 23:15:37 +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

…

proguard.flags

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%