Christine Franks 18cd618368 Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev ...

am: cb9a7075f8  -s ours

Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663

2017-07-22 00:31:39 +00:00

res

Import translations. DO NOT MERGE

2017-07-21 12:22:06 -07:00

src/com/android/settings

Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev

2017-07-21 23:59:23 +00:00

tests

Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev

2017-07-21 23:59:23 +00:00

Android.mk

Revert "Initial search bar implementation."

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

AndroidManifest.xml

Merge "Make the support loader activity display UI." into oc-dr1-dev

2017-07-21 01:47:17 +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%