Fan Zhang 5af580a419 Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours ...

am: ef61a45cf6  -s ours

Change-Id: If9d124cc6a362a152345a04e0748cd71c6fac42a

2017-11-03 00:40:07 +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

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%