OSDN Git Service

Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
authorSoroosh Mariooryad <soroosh@google.com>
Thu, 24 Aug 2017 04:20:30 +0000 (04:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 04:20:30 +0000 (04:20 +0000)
commit4e4d3631fca2532d1682e04f7aa3f297dc240820
tree5a1466eae75904e7041e20a2bacaa5a09191b765
parent31deb9a766be0a85daf6982606fec0b29d46f3d0
parentf83b94aa0c20f7fbb6b226257db1b74c0d2c4e77
Merge "Extending SearchFeatureProvider API to provide timeout" into oc-mr1-dev
am: f83b94aa0c

Change-Id: I72618b3a6e47661c6c690638db0ed7d7c1d8c08c