tree 24aa3d4dfd5180496259dd98fa66a37cf4066ccb
parent 81d8e2e4ddeb4c8bf864442cad7b1e74f0d10c48
parent ae8c2ca3ea307b2d72ee37b0a8db2001b2d8feba
author Tao Bao <tbao@google.com> 1546465220 -0800
committer android-build-merger <android-build-merger@google.com> 1546465220 -0800

Merge "minadbd: daemon_service_to_fd takes std::string_view." am: 72aa58dcf7 am: 29578b1117
am: ae8c2ca3ea

Change-Id: Id1850d341ef601914a67b9740d80e737857d2a80