Maurice Lam c03cf0092e resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302 ...

am: 0e1c486e74

Change-Id: I9b94c26c4df2329e388eeb925350a2446ef9148e

2017-10-16 19:25:57 +00:00

res

resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302

2017-10-16 19:25:57 +00:00

src/com/android/settings

Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7 am: 5973d32c77

2017-10-15 04:30:40 +00:00

tests

Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev

2017-10-12 19:02:55 +00:00

Android.mk

Merge "Remove unnecessary core-oj library"

2017-09-26 01:18:50 +00:00

AndroidManifest.xml

Merge "Fix wrong format in AndroidManifest.xml" am: de795d12d1 am: 39ddac51b6

2017-09-29 19:04:56 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

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

Keep classes/fields only used via reflection

2016-08-01 23:47:53 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%