OSDN Git Service

resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp
authorJohn Spurlock <jspurlock@google.com>
Thu, 8 Nov 2012 12:43:15 +0000 (07:43 -0500)
committerJohn Spurlock <jspurlock@google.com>
Thu, 8 Nov 2012 12:43:15 +0000 (07:43 -0500)
commit805337ab5fb2adf108726b351319d77007577bb4
tree8337e8af21cdbe7c4ffa8b0614b53e5fbb2afdc5
parent9a962d7c7df9ff762e3d9798cde868ad73b164db
parentef44a77f9181c13140c67988356b3ed3f5177434
resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp

Change-Id: Iad4319796be4b9ad74580f8c20a4e8cb30569f87
policy/src/com/android/internal/policy/impl/keyguard/KeyguardActivityLauncher.java
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java