Bonian Chen dfba6f8720 [Setting] Fix merge conflict ...

Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab

Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a

2019-11-26 07:20:30 +00:00

libs

…

protos

…

res

Add compatibility change preference

2019-11-21 11:48:07 +00:00

src/com/android/settings

[Setting] Fix merge conflict

2019-11-26 07:20:30 +00:00

tests

[Setting] Fix merge conflict

2019-11-26 07:20:30 +00:00

.gitignore

…

Android.bp

Convert Settings to Android.bp

2019-05-29 14:45:30 -07:00

AndroidManifest.xml

Merge "Add UI for mainline modules licenses." into qt-dev

2019-06-28 16:56:04 +00:00

CleanSpec.mk

…

color-check-baseline.xml

Updating colors for dark theme

2019-06-06 16:48:29 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

proguard.flags

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%