Conflicts: packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100
Conflicts: packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100