Hyunyoung Song 63f0f5b312 Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev ...

am: 2cbf71a0be

* commit '2cbf71a0be8abb646c5612e794cffa194edbdaf2':
  Add Shortcut API to Settings (1/2) b/28298258

Change-Id: I5ab2afdabae51375c01412855913c4e9c538b4b9

2016-05-04 21:42:09 +00:00

..

res

Import translations. DO NOT MERGE

2016-05-03 16:30:12 -07:00

src/com/android/settingslib

Add Shortcut API to Settings (1/2)

2016-05-04 18:51:30 +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