From: Matthew Fritze <mfritze@google.com>
Date: Sat, 22 Apr 2017 00:59:40 +0000 (+0000)
Subject: Merge "Remove duplicates between battery and display settings" into oc-dev
X-Git-Tag: android-x86-8.1-r1~113^2~51
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a95fc0f05f;p=android-x86%2Fpackages-apps-Settings.git

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

Change-Id: I1e824de321f7d8eeb9fbcefb22048af0ae5109be
---

a95fc0f05f48a2fba029a3235fbb1660b8b214d6