OSDN Git Service

Merge \\"Use startActivityDismissingKeyguard to show vpn setting page in keyguard...
authorTony Mak <tonymak@google.com>
Mon, 13 Jun 2016 12:39:10 +0000 (12:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 12:39:10 +0000 (12:39 +0000)
commitd7bf56cace938a2e5d413f4e89a7c90f3e543e27
tree6c26422274cb04131427fac0eedbb0b88d23295e
parenta0a6f5468746b85b4627c41b0b48577f280575bc
parent5f9c1b342f1309f90634b78371fffa9c311eda97
Merge \\"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\\" into nyc-dev am: becebcbc6d
am: 5f9c1b342f

Change-Id: Idb66b5564cf3f26788cb18878d2fc5726a4c8c8d
packages/SystemUI/src/com/android/systemui/qs/QSFooter.java