Amit Mahajan a69a6a9e34 resolve merge conflicts of 66a8895 to master ...

Change-Id: I227a240175034e862ad241ce9c6722a093919616

2016-09-19 10:14:41 -07:00

res

Update edit text padding on Bluetooth device renaming dialog am: 68125813b2 am: 152a666154

2016-09-19 16:42:57 +00:00

src/com/android/settings

resolve merge conflicts of 66a8895 to master

2016-09-19 10:14:41 -07:00

tests

Merge "Extend MetricsFactory so it can log to different LogWriters"

2016-09-15 23:07:33 +00:00

Android.mk

Build with AAPT2

2016-08-17 10:19:00 -07:00

AndroidManifest.xml

Merge "Remove references to removed string"

2016-09-15 20:29:30 +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

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%