[automerger skipped] Merge "Audio policy: fix HwModuleCollection::getDeviceDescriptor" am: 839cd0691b -s ours am: 41dad39e94 -s ours am: 7ee1b660d6 -s ours

am: f9ea4b800c -s ours
am skip reason: change_id I1370edbbca46657506a990855d06a176f07c54d3 with SHA1 947c0f18f5 is in history

Change-Id: Iad8a578e5590e63a9bfd2696c29fbd9bac3e2e2a
gugelfrei
Jean-Michel Trivi 5 years ago committed by android-build-merger
commit 29e02d0730

Diff Content Not Available