[automerger skipped] Merge "Audio policy: fix HwModuleCollection::getDeviceDescriptor" am: 839cd0691b
-s ours
am:gugelfrei41dad39e94
-s ours am skip reason: change_id I1370edbbca46657506a990855d06a176f07c54d3 with SHA1947c0f18f5
is in history Change-Id: I882a7df625a1fd3d51a4822ba4fef580d6011874
commit
7ee1b660d6