Keith Cheung 5b935c170a Merge "Include work app in battery optimization settings" into nyc-dev ...

am: 39066abb59

* commit '39066abb5929622a1918805bf85d19180c6dfe3d':
  Include work app in battery optimization settings

Change-Id: Ibd3aab6cde137ec145c43da3da2730dd62688d9f

2016-04-21 15:31:17 +00:00

..

res

Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev

2016-04-20 21:11:52 +00:00

src/com/android/settingslib

Merge "Include work app in battery optimization settings" into nyc-dev

2016-04-21 15:18:08 +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