OSDN Git Service

resolve merge conflicts of 4481b51 to master
authorJason Monk <jmonk@google.com>
Fri, 15 Jul 2016 16:32:33 +0000 (12:32 -0400)
committerJason Monk <jmonk@google.com>
Fri, 15 Jul 2016 16:32:33 +0000 (12:32 -0400)
commitd6ed970c4ab84c67afd544f9744406db031ffaa8
tree72feffc244d3b4a462f2565efe008a01907a17cb
parent074aec74d47e9a46ecca6a4c2cc1505769bc3c29
parent4481b51667c94d778dc78126c79cd4856720654c
resolve merge conflicts of 4481b51 to master

Change-Id: I97489764bfe30507120b65e5e996aa4409435488
packages/SystemUI/src/com/android/systemui/qs/QSDetail.java
packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java