[automerger skipped] Merge "qcom/audio/hal: add offset to MMAP output time"...
[automerger skipped] Merge "qcom/audio/hal: add offset to MMAP output time" into pi-dev am: 3d10162f -s ours
am: c69dce07 -s ours
am skip reason: change_id I7bc9924a7aaa34d2e721365aa8ee0b69de5936f8 with SHA1 51e6bc44 is in history
Change-Id: I7dbc9086288fd0c2c6853dc298c1c0995d4b0ca0