Commit fd334502 authored by Wonsik Kim's avatar Wonsik Kim Committed by Android Git Automerger
Browse files

am 1fdb11ed: am ced3d32f: resolved conflicts for merge of 2568bb5b to lmp-mr1-dev 

* commit '1fdb11ed':
  TV: add a test for overlay view from TV input to CtsVerifier DO NOT MERGE
parents bb2f300c 1fdb11ed
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