tree 20a4caa65576cf7e49cdbecf7cb6d7dc457cd708
parent a1ee7539ff07fb5b6ad9244e3e9fa66106962b93
parent 755205ade42d6458c68bf1ee6852db0b23ecc4f5
author Kenny Root <kroot@android.com> 1361901763 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361901763 -0800

am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help""

* commit '755205ade42d6458c68bf1ee6852db0b23ecc4f5':
  Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"