Merge "Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878 am: 43effe8441" into nyc-mr1-dev-plus-aosp

am: e3f3aef1e1

* commit 'e3f3aef1e13931fd250e5e93cdc151155f474a43':

Change-Id: I4c6a6bd3dda19537b775551459cedbc4379020c8
This commit is contained in:
Keith Cheung
2016-04-21 15:44:51 +00:00
committed by android-build-merger

Diff Content Not Available