Merge "Cancel authentication when secure camera is launched on Keyguard" into qt...

author Kevin Chyn <kchyn@google.com>

Wed, 12 Jun 2019 01:02:26 +0000 (01:02 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 12 Jun 2019 01:02:26 +0000 (01:02 +0000)
author Kevin Chyn <kchyn@google.com>
Wed, 12 Jun 2019 01:02:26 +0000 (01:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 12 Jun 2019 01:02:26 +0000 (01:02 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge
author	Kevin Chyn <kchyn@google.com>
	Wed, 12 Jun 2019 01:02:26 +0000 (01:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 12 Jun 2019 01:02:26 +0000 (01:02 +0000)