tree 80be76aba207c6026e00e64720fee8c697d9b773
parent 22090d46914711c80bc2ca9946dd8a5dbfde8c95
parent 786829989098bed64841d0c2ded92d330933cb17
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578954188 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578954188 +0000

[automerger skipped] Merge "AudioDeviceAddress: new class to store audio device information" am: 4ea970a8ed am: 30139dec91 am: 7868299890 -s ours
am skip reason: Change-Id I86d32590c54609b8d8a9f7ea60d9b4bf76113935 with SHA-1 6e9997ccd0 is in history

Change-Id: I7fc62ff71aef798de9adb2cfc3ade109c9a039d4