tree 802a0e91b0035a86f4f2ba37814796425594656b
parent db13a9bb58d510cfad3a31a49e0dac68ddaae43c
parent 4f7397b0f69f36e29cc35cdf2c5a01f07586734a
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1563328541 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1563328541 +0000

Merge "[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: ac6652d37d -s ours am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA1 0bbb2ed53e is in history" into qt-r1-dev-plus-aosp