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