Commit 85a5b4e6 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 7a1866d9: am 26df09a1: am 380a0c49: Merge changes... 

am 7a1866d9: am 26df09a1: am 380a0c49: Merge changes I5ffb1399,I2333765e,I64ca4e29,I6f393150 into lmp-sprout-dev

* commit '7a1866d9':
  media: centralize signaling of skipped tests
  media: update MediaCodecList handling to API 21
  cts: add tests to validate decoding profiles defined by CDD.
  cts: validate h264 and h265 codec profiles and level requirements.
parents 0b188ed0 7a1866d9
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