tree 2c556fb7c3ce4874df9481ccfee67b593388c172
parent 803b7d9f187cab0bc0e359650246f791d94678c8
parent 09947556ed21a4eebf1c81db7c5fed471c6dd370
author Kevin Rocard <krocard@google.com> 1571335529 -0700
committer android-build-merger <android-build-merger@google.com> 1571335529 -0700

[automerger skipped] Merge "DO NOT MERGE: Audio HAL: Add missing device to XSD" into pie-vts-dev am: 999c5e83c4 -s ours
am: 09947556ed -s ours
am skip reason: subject contains skip directive

Change-Id: Ie37fd2635376d769589429436c3e7ee4ad6cfd5c