OSDN Git Service

resolve merge conflicts of a1f64b0a9188 to oc-mr1-dev
authorLucas Dupin <dupin@google.com>
Tue, 25 Jul 2017 19:00:01 +0000 (12:00 -0700)
committerLucas Dupin <dupin@google.com>
Tue, 25 Jul 2017 19:00:01 +0000 (12:00 -0700)
commitef15776aaf850777dfa7f640bcd3889855a01314
treec5f1506a11d6f8c26ed51dae1ed7ba206ff85c28
parent3072aa76c9ee475bdc76d16987855a7b7feffff6
parenta1f64b0a9188d105ef1821510150b2ee42c9e47d
resolve merge conflicts of a1f64b0a9188 to oc-mr1-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic2395d055e1f27b186c3b87be5440dc410ee16a3
packages/SystemUI/AndroidManifest.xml
packages/SystemUI/res/values/styles.xml
packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java