tree 802a0e91b0035a86f4f2ba37814796425594656b
parent 7823451895b48f45debb5a265ba7b1970999c9bc
parent e64e670fab6477bc0edc18e07a7a630f9de29f6f
author Tao Bao <tbao@google.com> 1563328530 -0700
committer android-build-merger <android-build-merger@google.com> 1563328530 -0700

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

Change-Id: Ibe0aefbad6255e04c1df79e62d3808e75143a310