tree 254baeb27b773a1667cc81b9c9ca1547337f54f5
parent aec6950118319e93084f4c3d2ba6087e8f7e15df
parent 158d5e7f788d9b4d6d8876d38118250979c35e37
author TreeHugger Robot <treehugger-gerrit@google.com> 1519852735 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1519852735 +0000

Merge "[Companion] Stop scanning after 20sec timeout"