Bill Yi 662d23cd74 Merge "Import translations. DO NOT MERGE" into oc-dev am: 4bce1569a1 -s ours ...

am: 663f6ba460  -s ours

Change-Id: I044850d494fddad71263e55f0fd86faff7315ef7

2017-04-26 20:02:02 +00:00

res

Merge "Import translations. DO NOT MERGE"

2017-04-26 19:40:34 +00:00

src/com/android/settings

Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 9797a39ad7

2017-04-26 18:54:10 +00:00

tests

Merge "Import translations. DO NOT MERGE"

2017-04-26 19:40:34 +00:00

Android.mk

Depend on gingerbread variant of SuwLib

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

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

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

…

Description

No description provided

3.1 GiB

Languages

Java 89.8%

Kotlin 10.2%