OSDN Git Service

resolve merge conflicts of fbf366d to nyc-mr1-dev
authorJason Monk <jmonk@google.com>
Wed, 8 Jun 2016 20:24:16 +0000 (16:24 -0400)
committerJason Monk <jmonk@google.com>
Wed, 8 Jun 2016 20:24:16 +0000 (16:24 -0400)
commit5aa661d7c09fbd48d1d029fcb837af24dd74a9a1
tree25a8f28c4f203947056b9273ea4a3f3f0f65db9b
parent174e41b1fdaf2bb64a2e0e87be8fcc1767e29672
parentfbf366d7ee373db04df651e9712659d8ea1ee925
resolve merge conflicts of fbf366d to nyc-mr1-dev

Change-Id: If2c3d07d680c36b206fe49a8e8e7dc20619a5c42
packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
packages/SystemUI/res/values/config.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java