Merge "Hide lockscreen contents from a11y while bouncer is showing" into mnc-dev

author Adrian Roos <roosa@google.com>

Tue, 5 May 2015 21:05:33 +0000 (21:05 +0000)

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

Tue, 5 May 2015 21:05:36 +0000 (21:05 +0000)
author Adrian Roos <roosa@google.com>
Tue, 5 May 2015 21:05:33 +0000 (21:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 5 May 2015 21:05:36 +0000 (21:05 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
author	Adrian Roos <roosa@google.com>
	Tue, 5 May 2015 21:05:33 +0000 (21:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 5 May 2015 21:05:36 +0000 (21:05 +0000)