Merge "Don't set up external displays from binder thread" into klp-dev

author Jim Miller <jaggies@google.com>

Thu, 14 Nov 2013 01:47:32 +0000 (01:47 +0000)

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

Thu, 14 Nov 2013 01:47:32 +0000 (01:47 +0000)
author Jim Miller <jaggies@google.com>
Thu, 14 Nov 2013 01:47:32 +0000 (01:47 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 14 Nov 2013 01:47:32 +0000 (01:47 +0000)
diff --cc packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
Simple merge
author	Jim Miller <jaggies@google.com>
	Thu, 14 Nov 2013 01:47:32 +0000 (01:47 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 14 Nov 2013 01:47:32 +0000 (01:47 +0000)