Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev am: 604df3cc55

am: 0d2b782c28  -s ours

Change-Id: I9ec3623ddcf18bfd8a321072c9103d6988b656d9
This commit is contained in:
Andrew Sapperstein
2017-07-07 22:51:12 +00:00
committed by android-build-merger

Diff Content Not Available