Merge "Remove battery color when in power save" into lmp-dev

author Jorim Jaggi <jjaggi@google.com>

Wed, 20 Aug 2014 18:56:04 +0000 (18:56 +0000)

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

Sat, 16 Aug 2014 04:29:45 +0000 (04:29 +0000)
author Jorim Jaggi <jjaggi@google.com>
Wed, 20 Aug 2014 18:56:04 +0000 (18:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 04:29:45 +0000 (04:29 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
author	Jorim Jaggi <jjaggi@google.com>
	Wed, 20 Aug 2014 18:56:04 +0000 (18:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 16 Aug 2014 04:29:45 +0000 (04:29 +0000)