Peter Qiu 41f3ad1c05 Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev am: fca9a47ba8 ...

am: 1387d056f9

Change-Id: Iad364bc777c571bac8aa1c31dcdc9e50ed815069

2017-08-03 04:47:05 +00:00

..

res

Import translations. DO NOT MERGE

2017-08-01 16:55:49 -07:00

src/com/android/settingslib

Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev am: fca9a47ba8

2017-08-03 04:47:05 +00:00

tests

Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev am: fca9a47ba8

2017-08-03 04:47:05 +00:00

Android.mk

…

AndroidManifest.xml

…

common.mk

Add missing resource when building in AAPT1

2017-07-07 21:23:16 -07:00