Commit cab160ba authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Android Git Automerger
Browse files

am 99f836b7: resolved conflicts for merge of a36ed7c1 to lmp-mr1-dev 

* commit '99f836b7':
  Camera: fix recording test for legacy mode
parents 48f50fb0 99f836b7
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