OSDN Git Service

Merge "Search results always highlight proper results" into oc-dev am: 2a32cb6a33...
authorMatthew Fritze <mfritze@google.com>
Fri, 9 Jun 2017 01:29:15 +0000 (01:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 01:29:15 +0000 (01:29 +0000)
am: e844588e0e

Change-Id: I25ec3fe7798ec88fa91028914e11ee519ef74662


Trivial merge