Commit 4c5d3c8b authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

[automerger skipped] Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev 

am: 9990deda  -s ours

Change-Id: I72ac5d1bf53726180a4e9afa6ca5e2c71e3b7521
parents be6db4ba 9990deda
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