tree f35634c4fb2492ed789cf9b313d6d43bf2e6d7ba
parent fd8d08c22a33aa65e310274fb4fcc506c92f25f2
parent 9c58a871f9fb356409d3b90734bf706d1463f041
author Paul Lawrence <paullawrence@google.com> 1412317017 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412317017 +0000

am 9c58a871: Use monotonic clock for cryptfs progress

* commit '9c58a871f9fb356409d3b90734bf706d1463f041':
  Use monotonic clock for cryptfs progress