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

am: 39066abb59

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

Change-Id: I3603894e9aca5b1dbe2ed0f6615ac8467e470a82

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

..

res

Merge "Allow fragments set their own header view below actionbar." into nyc-mr1-dev

2016-04-20 20:50:17 +00:00

src/com/android/settingslib

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

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

tests

…

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