tree cddcd3ae3eb65204dee253507603a5edf25505bc
parent 80da83ac31925326b3a76f10564c05f2043c70f0
parent 3af04b71e51e89af02a1fe526e4fc32dce0100d3
author Jean-Baptiste Queru <jbq@google.com> 1345483778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345483778 -0700

am 3af04b71: am 7c386a61: Merge "Extend and document the "wait" command"

* commit '3af04b71e51e89af02a1fe526e4fc32dce0100d3':
  Extend and document the "wait" command