Tony Mak 47a7d102c6 Merge "Show app battery usage in correct user" into oc-dev am: 7226c9f4c4 ...

am: f7c007b2c1  -s ours

Change-Id: I77d663cdd0c9dc6a3a411789591421a238a76766

2017-05-24 10:56:22 +00:00

res

Merge "Misc fixes to search and UI."

2017-05-24 01:25:16 +00:00

src/com/android/settings

Merge "Update Settings search result unique ids"

2017-05-24 04:48:45 +00:00

tests

Merge "Update Settings search result unique ids"

2017-05-24 04:48:45 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

2016-12-16 14:11:02 -08:00

AndroidManifest.xml

Merge "Update intent priority for AdvancedAppsActivity."

2017-05-23 22:38:22 +00:00

CleanSpec.mk

…

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

…

wrap_alpha.py

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%