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

am dffc27a8: (-s ours) am 56ff8e31: Revert "DO NOT MERGE: media: CTS... 

am dffc27a8: (-s ours) am 56ff8e31: Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"

* commit 'dffc27a8':
  Revert "DO NOT MERGE: media: CTS workarounds for framework bugs"
parents 9677faad dffc27a8
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