am 1888de8e: merge from open-source master

Merge commit '1888de8e13f82f7af21bce267254fac124237afe' into kraken

* commit '1888de8e13f82f7af21bce267254fac124237afe':
  toolbox: add "uptime" command
This commit is contained in:
The Android Open Source Project 2010-04-12 13:28:12 -07:00 committed by Android Git Automerger
commit a8415325a8
1 changed files with 1 additions and 0 deletions

View File

@ -50,6 +50,7 @@ TOOLS := \
top \
iftop \
id \
uptime \
vmstat \
nandread \
uptime \