Hyunyoung Song 1c23149728 Merge "Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev am: 2cbf71a0be" into nyc-mr1-dev-plus-aosp ...

am: 5ff313c9f8

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

Change-Id: Ifbb00ca50874d731319f6c34287f5440936b2586

2016-05-04 22:08:22 +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

…

Android.mk

SettingsLib: Build with AAPT2

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

AndroidManifest.xml

…

common.mk

SettingsLib: Build with AAPT2

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