| commit | 11dc79260f87d0f5c977532ab876884435bf5b96 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 12 17:00:52 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 12 17:00:52 2010 -0700 |
| tree | 23e4f3f24c1d32d6034766c5760dda9eb01cdee9 | |
| parent | 59ab0c534095afdab0765240a6eaeaad2ab43ab0 [diff] | |
| parent | a8415325a8b2638c25a6364c191ac1046c925906 [diff] |
am a8415325: am 1888de8e: merge from open-source master
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 5f72311..5404fd4 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk
@@ -50,6 +50,7 @@ top \ iftop \ id \ + uptime \ vmstat \ nandread \ uptime \