am 05c1cada: am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread

Merge commit '05c1cadaeaf272a70acc889bfccd607648058470'

* commit '05c1cadaeaf272a70acc889bfccd607648058470':
  Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.
tree: b9451ddcb6aa799aadadc4c3c3c004f04068ee6b
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/