Charles He 65fa77889a Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev am: 09317a6545 ...

am: 4aad6f98f4

Change-Id: I79b3b079cf307e9110da54a47082751d67107c76

2017-04-26 17:07:31 +00:00

res

Merge "Move battery stats loading to AsyncLoader." into oc-dev am: d0ea1386ad

2017-04-26 10:55:55 +00:00

src/com/android/settings

Merge "Turn off QUIET_MODE before changing unified lock credential." into oc-dev am: 09317a6545

2017-04-26 17:07:31 +00:00

tests

Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev am: f650c82b16

2017-04-26 17:07:07 +00:00

Android.mk

…

AndroidManifest.xml

resolve merge conflicts of 999f6a9a29 to master

2017-04-26 12:21:23 +01:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

PREUPLOAD.cfg

…

proguard.flags

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%