Commit a7d3ba09 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger skipped] Merge "Make CTS test testQuery more flexible" into... 

[automerger skipped] Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990deda  -s ours skipped: 4c5d3c8b

Change-Id: Iaf4387428250a708bbed43c6057f873a98e68c1a
parents 29204e19 4c5d3c8b
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