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:
604df3cc55
am: 0d2b782c28 -s ours
Change-Id: I9ec3623ddcf18bfd8a321072c9103d6988b656d9