tree 60e5b89a6a6b4dae6951d8b12542fbaa1f3aa8be
parent a09e8dcfd5d1cfd017c120f0b4bc32944cfbb627
parent 2ff9fda870c33a023fcf4d979dbc28d11abddbdc
author Tao Bao <tbao@google.com> 1562866169 -0700
committer android-build-merger <android-build-merger@google.com> 1562866169 -0700

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

Change-Id: I00c6a935062a6056d60487416b23bc740cf0199a