OSDN Git Service

am 2b033dce: Merge "Clean up KeyguardSecurityCallback documentation and add copyright...
authorJim Miller <jaggies@google.com>
Tue, 28 Jan 2014 23:28:42 +0000 (15:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jan 2014 23:28:42 +0000 (15:28 -0800)
* commit '2b033dce9f252ae30ac88c9ba1569d18afaaf2cf':
  Clean up KeyguardSecurityCallback documentation and add copyright header.


Trivial merge