tree 51305e00dc0532737e51f9dbed19e657bb36f87a
parent b2104dbcbac06b6ec5de538037bf574c7c3e0962
parent db13a9bb58d510cfad3a31a49e0dac68ddaae43c
author Tao Bao <tbao@google.com> 1563329672 -0700
committer android-build-merger <android-build-merger@google.com> 1563329672 -0700

[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: e64e670fab -s ours
am: db13a9bb58 -s ours
am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history

Change-Id: I7ffebae0e623793f0aed07eb7e5a73755ccf27ae