Maurice Lam 0e1c486e74 resolve merge conflicts of f36b25c2df to stage-aosp-master ...

am: d4621f6302

Change-Id: I7f2e89579a99523808138eaabffa917b1e02e3b0

2017-10-16 19:22:12 +00:00

res

resolve merge conflicts of f36b25c2df to stage-aosp-master

2017-10-16 18:31:40 +00:00

src/com/android/settings

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

2017-10-15 03:59:02 +00:00

tests

Merge "Fix NPE crash in UsageAccessDetails"

2017-09-21 19:24:52 +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

2017-09-29 14:46:23 +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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%