Jason Monk 47d17a4f18 Merge \"Pre-setup restrictions\" into nyc-dev ...

am: f84c05c360

Change-Id: I2902c765eeacdbe05a393b01936572233c783988

2016-07-19 20:37:15 +00:00

..

res

Import translations. DO NOT MERGE

2016-07-11 12:37:54 -07:00

src/com/android/settingslib

Merge \"Pre-setup restrictions\" into nyc-dev

2016-07-19 20:37:15 +00:00

tests

SettingsLib: Fix wifi crash during settings index

2015-05-22 11:26:34 -04:00

Android.mk

SettingsLib: Build with AAPT2

2016-04-14 14:45:21 -07:00

AndroidManifest.xml

Add uses-sdk to reduce red squigglies

2015-06-08 15:46:51 -07:00

common.mk

SettingsLib: Build with AAPT2

2016-04-14 14:45:21 -07:00