OSDN Git Service

Merge "Update keyguard API"
authorAndres Morales <anmorales@google.com>
Fri, 20 Mar 2015 01:56:11 +0000 (01:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Mar 2015 01:56:13 +0000 (01:56 +0000)

Trivial merge