tree 6804f0dcbd1cad0144a71b10da68c11d85f6c04d
parent 46176668bade11aff51373f32b1ff9b45d8c1dd5
parent 7e3b74149a1f1f4e190fae18bcee7ca7c9d711db
author Eric Laurent <elaurent@google.com> 1608658730 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608658730 +0000

[automerger skipped] Merge "Introduce device(s) role for strategy." am: e8a66c66ba am: 2ed262362f am: 7e3b74149a -s ours

am skip reason: Change-Id I0af737542a8599938cae4e142b733159f21ed5a8 with SHA-1 0a488938fa is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1534352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia413a3caa68fb8efce798e6844dcda7a9db9844d