Merge "Remove duplicates between battery and display settings" into oc-dev am: 1c7e25d3b6

am: a95fc0f05f  -s ours

Change-Id: I52edd436dd1a4dd97e548993de8a786c3ff17f74
This commit is contained in:
Matthew Fritze
2017-04-22 01:02:39 +00:00
committed by android-build-merger

Diff Content Not Available