Commit 36f4db0a authored by Android Merger's avatar Android Merger Committed by android-build-merger
Browse files

Merge "Merge "Deflake WebViewTest#testPageScroll" into lollipop-mr1-cts-dev... 

Merge "Merge "Deflake WebViewTest#testPageScroll" into lollipop-mr1-cts-dev am: f2c78449" into marshmallow-cts-dev
am: e6188797

Change-Id: I92dcf68bb0128e39b73fc02a59277fb2949f70a6
parents 3f5bc1ec e6188797
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