Cai, Min1 088baf348b Merge "Refresh payment preference while resume" ...

am: 05650bb3da

Change-Id: Ib4876e7d4f17b99699f3b7f328cd1b1eafb19eba

2017-10-16 19:29:33 +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 "Refresh payment preference while resume"

2017-10-16 19:29:33 +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"

2017-09-29 09:37:17 +00:00

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

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%