OSDN Git Service

Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev am: fdc84a13a2
authorSelim Cinek <cinek@google.com>
Mon, 3 Jul 2017 10:59:17 +0000 (10:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Jul 2017 10:59:17 +0000 (10:59 +0000)
commit3594b9f4fda1e83c48aba8ace4c688d5c0ea21c6
treedb31f29a2dc6a776f93c5a670e590f03285f5d8a
parentc523f4dc0c9226738a53b7d85279f4d151273b6f
parent3ec9d993ce0112919d57ae2958c682ba7ac4f690
Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev am: fdc84a13a2
am: 3ec9d993ce

Change-Id: I307a3d65603f5ede0e283f36715271bc68b8eabd
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java