Commit eba2d5e7 authored by Stuart Scott's avatar Stuart Scott Committed by Android Git Automerger
Browse files

am ba5b3a43: am 055846ca: Merge "Fix CTS android.media package... 

am ba5b3a43: am 055846ca: Merge "Fix CTS android.media package testEncodeVirtualDisplay seldom fail issue"

* commit 'ba5b3a43':
  Fix CTS android.media package testEncodeVirtualDisplay seldom fail issue
parents 825cd03c ba5b3a43
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