tree b66ab3d99d559f0c2169a07e867edb0d8c0dffae
parent 5c805ec073298ba9b487a619bf3b8501d924404f
parent d0b1970de43c5b14fe6e37015131d76ede221abb
author Fyodor Kupolov <fkupolov@google.com> 1529529697 -0700
committer android-build-merger <android-build-merger@google.com> 1529529697 -0700

[automerger skipped] Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990dedab5  -s ours skipped: 4c5d3c8bd6 skipped: a7d3ba097f skipped: c6507912d2 skipped: a5f0593625 skipped: b08abacb21 skipped: fb897d812d skipped: 62d7e3f572 skipped: 7834ffd857 am: 526b6579d6 am: 6f69a963b0
am: d0b1970de4

Change-Id: Ibf813c7bcb08f93404fc08b0dbd513c119d5a12a