OSDN Git Service

am 5e612cf0: Add KeyguardSimpleHostView and make it the default
authorJim Miller <jaggies@google.com>
Fri, 7 Feb 2014 01:10:59 +0000 (17:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Feb 2014 01:10:59 +0000 (17:10 -0800)
* commit '5e612cf07872dc0989a4b9f09e2a38a2ee12186d':
  Add KeyguardSimpleHostView and make it the default


Trivial merge