OSDN Git Service

resolve merge conflicts of 9600df0 to stage-aosp-master
authorJason Monk <jmonk@google.com>
Tue, 6 Dec 2016 16:34:12 +0000 (11:34 -0500)
committerJason Monk <jmonk@google.com>
Tue, 6 Dec 2016 16:34:12 +0000 (11:34 -0500)
commitf120cf3d886753b4ae28bda48b1d2b10b754798c
tree309c0d0c58cc1bf3d6a5745bf51f5e8ce199e677
parent1abe6def681cfefd9120fe5ca9c2a65dc5cefb60
parent9600df035b9994ae481dd7ce0335241b752f7034
resolve merge conflicts of 9600df0 to stage-aosp-master

Change-Id: I139c64bb2440d64312d7e763e53bdb13dcb9f1aa
packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java