OSDN Git Service

resolve merge conflicts of b9d34b3 to master
authorFan Zhang <zhfan@google.com>
Fri, 15 Jul 2016 21:21:47 +0000 (14:21 -0700)
committerFan Zhang <zhfan@google.com>
Fri, 15 Jul 2016 21:21:47 +0000 (14:21 -0700)
commitf04fe0489f7e6e16ef628559739f63b5d25674e6
tree11db125d26c368d5ac32992352abce495662a7fd
parent1fa74491cc37b9038b7d40aa879648597e988c93
parentb9d34b3877753a4558fe1927e5b107e88ae2aef8
resolve merge conflicts of b9d34b3 to master

Change-Id: Id88ecf373378f9ed7c18a3d2d84ab419dd033891
packages/SystemUI/res/layout/qs_detail_items.xml
packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java