Merge "Show back button while RemoteInput is active on keyguard"

author Adrian Roos <roosa@google.com>

Thu, 7 Jan 2016 16:10:53 +0000 (16:10 +0000)

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

Thu, 7 Jan 2016 16:10:53 +0000 (16:10 +0000)
author Adrian Roos <roosa@google.com>
Thu, 7 Jan 2016 16:10:53 +0000 (16:10 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 7 Jan 2016 16:10:53 +0000 (16:10 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
author	Adrian Roos <roosa@google.com>
	Thu, 7 Jan 2016 16:10:53 +0000 (16:10 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 7 Jan 2016 16:10:53 +0000 (16:10 +0000)