OSDN Git Service

am 8dc38d96: Remove userActivity() from Settings now that it\'s managed by Fingerprin...
authorJim Miller <jaggies@google.com>
Fri, 26 Jun 2015 21:12:13 +0000 (21:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Jun 2015 21:12:13 +0000 (21:12 +0000)
* commit '8dc38d96ba7070b63d1ba71f2cde2136be493952':
  Remove userActivity() from Settings now that it's managed by FingerprintService


Trivial merge