Merge "Fix storage summary background colors." into oc-dev

author Daniel Nishi <dhnishi@google.com>

Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 23 May 2017 17:35:19 +0000 (17:35 +0000)
author Daniel Nishi <dhnishi@google.com>
Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 23 May 2017 17:35:19 +0000 (17:35 +0000)
diff --cc src/com/android/settings/fuelgauge/BatteryMeterView.java
Simple merge
author	Daniel Nishi <dhnishi@google.com>
	Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 23 May 2017 17:35:19 +0000 (17:35 +0000)