Lei Yu a18cefa31e [automerger skipped] Merge "Add action log in "Restrict app page"." into pi-dev am: 8075586a2e ...

am: cc7b1cf5f2  -s ours

Change-Id: I9aeeaeef4b958a6fac1da54fe5205bb706273fb1

2018-05-21 18:42:56 -07:00

res

Merge "Misc GAR fixes"

2018-05-21 23:40:29 +00:00

src/com/android/settings

Merge changes from topic "BT_Discoverable_in_Connected_Devices"

2018-05-22 01:23:34 +00:00

tests

Merge changes from topic "BT_Discoverable_in_Connected_Devices"

2018-05-22 01:23:34 +00:00

Android.mk

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

AndroidManifest.xml

Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev am: ef088843ae

2018-05-17 12:25:28 -07:00

CleanSpec.mk

…

color-check-baseline.xml

Fix color lint baseline. am: 76a0ef6adb

2018-05-18 14:39:57 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

OWNERS

Exempt res folder from OWNERS approval.

2017-10-13 15:59:03 -07:00

PREUPLOAD.cfg

Add string linter preupload check

2018-03-26 21:38:34 -07:00

proguard.flags

Migrate Settings to androidx.

2018-04-20 12:52:29 -07:00

wrap_alpha.py

…

Description

No description provided

1.5 GiB

Languages

Java 89.7%

Kotlin 10.3%