Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev

author Selim Cinek <cinek@google.com>

Wed, 1 Jun 2016 19:03:40 +0000 (19:03 +0000)

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

Wed, 1 Jun 2016 19:03:43 +0000 (19:03 +0000)
author Selim Cinek <cinek@google.com>
Wed, 1 Jun 2016 19:03:40 +0000 (19:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 1 Jun 2016 19:03:43 +0000 (19:03 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Simple merge
author	Selim Cinek <cinek@google.com>
	Wed, 1 Jun 2016 19:03:40 +0000 (19:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 1 Jun 2016 19:03:43 +0000 (19:03 +0000)