am f6131ce3: am 4a6807bb: Merge "Sanity check padding/delay values for gapless...
am f6131ce3: am 4a6807bb: Merge "Sanity check padding/delay values for gapless playback" into mnc-dev
* commit 'f6131ce3':
Sanity check padding/delay values for gapless playback