Pavel Zhamaitsiak acb25a1d9a resolve merge conflicts of 5a1e5edeb7 to master. ...

Change-Id: Ie980796ac4f02e82d6d734e5e124fb885302e18d

2016-01-12 14:39:42 -08:00

res

Merge "Emulator: Have the Settings page say "About emulated device""

2016-01-12 22:13:24 +00:00

src/com/android/settings

resolve merge conflicts of 5a1e5edeb7 to master.

2016-01-12 14:39:42 -08:00

tests

Import translations. DO NOT MERGE

2016-01-05 07:56:37 -08:00

Android.mk

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

AndroidManifest.xml

Merge "Use the new TETHER_PRIVILEGED permission."

2016-01-11 19:10:26 +00:00

CleanSpec.mk

CleanSpec!

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Add option to reset network settings to factory

2015-03-09 13:18:50 -07: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%