tree cdb9bc49d5e7e8166c61204bfedc8fa6e425855e
parent 0f7c043ba89de91cb9531645893f3cb79e15ced5
parent 70f22d6b7620b5a3a11ef1d8136a4d10efe14670
author Greg Hackmann <ghackmann@google.com> 1387326527 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387326527 +0000

am 70f22d6b: am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"

* commit '70f22d6b7620b5a3a11ef1d8136a4d10efe14670':
  toolbox: uptime: fix unused parameter warnings