am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief...

am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1

* commit 'a4a81aef':
  After a seek there's a brief period where audio time isn't reestablished.