tree e3756402c6ffa658e404435bab76448d2778f03e
parent 7dbc0936e858acb5842d35b67caf917e6f459dbb
parent 1498261fc5bc8896abbbc586f46992d6bf53ee46
author Elliott Hughes <enh@google.com> 1441125404 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441125404 +0000

am 1498261f: Merge "Lose uptime to toybox."

* commit '1498261fc5bc8896abbbc586f46992d6bf53ee46':
  Lose uptime to toybox.