tree b63336895e8e2e199d851a394e55a8c19de3574e
parent b489b9ba5bf3e7d6c785e22f068449fb2b63987e
parent 3d10162fb21989d65955452b2e1ed072b0bd0970
author Phil Burk <philburk@google.com> 1554766117 -0700
committer android-build-merger <android-build-merger@google.com> 1554766117 -0700

[automerger skipped] Merge "qcom/audio/hal: add offset to MMAP output time" into pi-dev
am: 3d10162fb2 -s ours
am skip reason: change_id I7bc9924a7aaa34d2e721365aa8ee0b69de5936f8 with SHA1 28c35e5c89 is in history

Change-Id: I196cd07e23dc5473d3c73ef385aa961e7075b4cd