OSDN Git Service

resolve merge conflicts of a5b457b3bf6f to oc-dr1-dev
authorJason Monk <jmonk@google.com>
Thu, 8 Jun 2017 17:00:40 +0000 (13:00 -0400)
committerJason Monk <jmonk@google.com>
Thu, 8 Jun 2017 17:00:40 +0000 (13:00 -0400)
commitd7dab0f36f9e6568809b01964a1120f9827cc944
tree4e7193c6e21cc895a4485d940d6158e9a7c450dd
parent62031b89372bd1b9090573873c994e9f623ad106
parenta5b457b3bf6f61c482badf36858d7d278befcd70
resolve merge conflicts of a5b457b3bf6f to oc-dr1-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aa49bfdbd2c44684d0edb21b52520fea406e167
packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java
packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java