[automerger skipped] Merge "AudioResampler: Add property for resampler...
[automerger skipped] Merge "AudioResampler: Add property for resampler testing." into qt-dev am: 0e8d9896
am: 187e4526 -s ours
am skip reason: change_id I983ab3ef7303fc9d93fc680de05d0cf3cfd7ff5a with SHA1 076f690a is in history
Change-Id: Idd4d85f191504c99b42860d01e6d67e5c4995b14