tree 93c8b7bacca95dd4f861c1763aa68fecc723c4c1
parent e41ea2c0888964a5feb5836260f7f93cd36e0a8f
parent 5132d62600484bb4fce86295b288c782bee91de8
author The Android Open Source Project <initial-contribution@android.com> 1354033354 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354033354 -0800

am 5132d626: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit '5132d62600484bb4fce86295b288c782bee91de8':
  Update the content shell command's usage instructions.