tree f1430ab0a0102d15d5489bca0ed4b5b909f938b9
parent 3415d411073113b44d9fcfd2b7ca7cc0d483d27c
parent ca0a6f0493c2b6a4b6ea20b31a37457accdaf126
author Kenny Root <kroot@google.com> 1310691416 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310691416 -0700

am ca0a6f04: am 008cbcd0: Merge "Add -F for classify to ls"

* commit 'ca0a6f0493c2b6a4b6ea20b31a37457accdaf126':
  Add -F for classify to ls