tree 51305e00dc0532737e51f9dbed19e657bb36f87a
parent 8042057f6ee50b24fe5e3eeeed034f83986e8bbb
parent 40f08bfc7c86850ca1076a10a6536f4eaa832ab9
author Tao Bao <tbao@google.com> 1563329693 -0700
committer android-build-merger <android-build-merger@google.com> 1563329693 -0700

Merge "[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: ac6652d37d -s ours
am: 40f08bfc7c -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 dd0158ac60 is in history

Change-Id: I53dec01a5517bf4d55a352523fa38a008d6136ae