tree f1430ab0a0102d15d5489bca0ed4b5b909f938b9
parent a38ec2b7d4324965d55a020baf4ad8b979d69597
parent 008cbcd082f21683b3b53d1ca84725b72b2f90b6
author Kenny Root <kroot@google.com> 1310691294 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310691294 -0700

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

* commit '008cbcd082f21683b3b53d1ca84725b72b2f90b6':
  Add -F for classify to ls