tree 809c49b71e5165e8489e7abf4e5be79e372a8fc5
parent d463b5826dfed97ce78767582a7ebb5ddd559b62
parent 5fd7ab4b450b89cd2322949f52866f6fef70a884
author Colin Cross <ccross@android.com> 1555469485 -0700
committer android-build-merger <android-build-merger@google.com> 1555469485 -0700

[automerger skipped] Merge "Update QuickSearchBox for guava 27.1" am: fef9a27d24 am: ffcc0b60c8 -s ours
am: 5fd7ab4b45 -s ours
am skip reason: change_id I9196cddee5e0fb08dee6c6fa868cdb33c43c1888 with SHA1 a74d860aa3 is in history

Change-Id: I982bfcbaa5741e04e874e4342aba459512be42c6