Commit 4ab291d9 authored by Aaron Whyte's avatar Aaron Whyte Committed by Android Git Automerger
Browse files

am f61eb15e: am 26e98d67: Merge "Fixed... 

am f61eb15e: am 26e98d67: Merge "Fixed android.widget.cts.FrameLayoutTest#testAccessMeasureAllChildren on watches, which have much smaller screens than phones. Bug:15131296" into klp-modular-dev

* commit 'f61eb15e':
  Fixed android.widget.cts.FrameLayoutTest#testAccessMeasureAllChildren on watches, which have much smaller screens than phones. Bug:15131296
parents d1b453de f61eb15e
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