Phil Weaver 3ca763f1b0 Merge "Back-port ag/2491664 am: 1d21738bd6 am: 4150739791 -s ours am: 9d889600a9 am: f6b1267780 am: 5d3967338d am: 57aa22c671 am: 91f4a42dac am: ba26fabe3e am: 85aa9ccc69 am: 2e2e6fcc04 am: 625d4bffc7 am: 066f79adc3 am: f7d3537fcd" into oc-dr1-dev-plus-aosp ...

am: aa0772ff7e

Change-Id: I310d25174d3c24c749f4d77c29eb154ef4ed7cf6

2017-07-18 21:09:28 +00:00

res

Merge "Align the version number text view." into oc-dr1-dev am: aead86058d

2017-07-18 17:27:59 +00:00

src/com/android/settings

Merge "Never store battery stats for cache" into oc-dr1-dev am: 8f8797f768

2017-07-18 21:06:25 +00:00

tests

Merge "Never store battery stats for cache" into oc-dr1-dev am: 8f8797f768

2017-07-18 21:06:25 +00:00

Android.mk

Revert "Initial search bar implementation."

2017-06-06 17:30:17 +00:00

AndroidManifest.xml

Merge "Print system APIs require a permission"

2017-07-17 20:27:54 +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%