Commits
Dan Morrill authored 74e646cab9aM
Fix merge conflict for 'c2e1e329'. Conflicts: core/res/res/values/config.xml packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java Change-Id: I5898fe2cbfb3a4bdcb28c27adb51d2aa93138f99
Showing diff toed1a9c778c3