OSDN Git Service

Merge "[Companion] Stop scanning after 20sec timeout"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 28 Feb 2018 21:18:55 +0000 (21:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 28 Feb 2018 21:18:55 +0000 (21:18 +0000)

Trivial merge