tree 5b9e9d4990c95ac40f8240c9660a373064543663
parent f8b8f6f8738b9780067e9e56bac8c1de9449b94c
parent 3f9e843d924f220f6094241bc765cd69d8fc6d7b
author Jean-Baptiste Queru <jbq@google.com> 1346263099 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346263099 -0700

am 3f9e843d: am 9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"

* commit '3f9e843d924f220f6094241bc765cd69d8fc6d7b':
  recordvideo: Sleep while waiting for the encoding to finish