OSDN Git Service

Merge "Block inline-results from Settings search" into oc-dr1-dev
authorMatthew Fritze <mfritze@google.com>
Wed, 21 Jun 2017 17:42:48 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jun 2017 17:42:48 +0000 (17:42 +0000)
commiteeec8eecc0e97865355ecadd0940d55e34d96a2f
tree97e5ff843ba22ec53824756bfa485299cec3dbf6
parent776fe841f9551716c9b3769f934720e16725de3f
parentbea9a5d739e78bb39d095dce7548ab8ffcbab806
Merge "Block inline-results from Settings search" into oc-dr1-dev
am: bea9a5d739

Change-Id: Ie9ba24744922dccedfec07a034c2374695f77214