Bernard Chau 60b73587bb Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev am: 25c43b7 ...

am: d17b301

* commit 'd17b3013ce7bd38aaf16d1ffd578d964bfd1808a':
  Includes both direct boot aware and unaware apps in Apps default view

Change-Id: I85630c13799c9bbaa558a0f1582691f7a00e0b86

2016-04-14 18:52:53 +00:00

..

res

Merge "Merge "Rename home to settings home" into nyc-dev am: 65fc8c8" into nyc-dev-plus-aosp

2016-04-12 22:35:52 +00:00

src/com/android/settingslib

Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev am: 25c43b7

2016-04-14 18:52:53 +00:00

tests

…

Android.mk

Move restricted padlock support to SettingsLib

2016-01-12 18:14:24 +00:00

AndroidManifest.xml

…

common.mk

…