Skip to content
Commit fa2d8ad0 authored by Marin Shalamanov's avatar Marin Shalamanov Committed by Android (Google) Code Review
Browse files

Merge changes I667e7cf9,I06a7133e into sc-dev 

* changes:
  Fix flaky test in LocalDisplayAdapter
  DisplayModeDirector: Prefer the default mode if available
parents 0b9157e6 439336a3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment