Conflicts: packages/SystemUI/res/values/colors.xml packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
Conflicts: packages/SystemUI/res/values/colors.xml packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e