Commit 5b46b419 authored by Unsuk Jung's avatar Unsuk Jung Committed by Android Git Automerger
Browse files

am 1bb0461f: resolved conflicts for merge of 353fb28b to klp-modular-dev-plus-aosp 

* commit '1bb0461f':
  cts: escaping check for graphics device.
parents cc307f9f 1bb0461f
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