am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an...
am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
* commit '46956b06':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.