Commit 5a707576 authored by Paul McLean's avatar Paul McLean Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "DO NOT MERGE Relaxing "Mandated" peripheral... 

Merge "[automerger skipped] Merge "DO NOT MERGE Relaxing "Mandated" peripheral requirements for CTSV USB Audio test." into oreo-cts-dev am: 22f7be56  -s ours" into oreo-mr1-cts-dev
am: fda0a03a  -s ours

Change-Id: Id59ac5e6936193eb9f21fdd92ccaab7438aff6a5
parents daf247e4 fda0a03a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment