tree 9232fad7dac365eeaad84efbbdd973cb0f0b851a
parent 633b4c8cc1f41370576aa43e6c5a70e4865a36df
parent 02b959962097577bcebfb31206fba1fe84fe2ed2
author Andreas Huber <andih@google.com> 1298677387 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298677387 -0800

am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb

* commit 'cd6828e84220c6bdf92bbca12fcd88a8da76387c':
  DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.