tree 78be40de6644c90ba0e6a5a41f70d36d29421e9d
parent 823c6bdad4844ee1ee9edb25bcd2e310aa913ca3
parent 0366056a0e7a844e42c03e5311ffbd036892094b
author Fyodor Kupolov <fkupolov@google.com> 1529543065 -0700
committer android-build-merger <android-build-merger@google.com> 1529543065 -0700

Merge "Merge "Merge "Merge "Merge "Make CTS test testQuery more flexible" into marshmallow-cts-dev am: 9990dedab5" into nougat-cts-dev am: 625c8ca8e9" into nougat-mr1-cts-dev am: e89422ac54" into oreo-cts-dev am: 628ef43532" into oreo-mr1-cts-dev
am: 0366056a0e

Change-Id: I41ae73e191436548bdd33d9626605e54943b35a5