tree 42c3645c45fa7ab244ed5bb2bb424e04b9c6f508
parent dc09ffad2a7a68e96eadec0f81611b3538ef78a5
parent 58e378b02561d8f606066537b193b0eb62e2404f
author Jorim Jaggi <jjaggi@google.com> 1442537327 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442537327 +0000

am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev

* commit '58e378b02561d8f606066537b193b0eb62e2404f':
  Start fingerprint authentication in onStartedGoingToSleep