tree d075a887d79e7d84cf7bdd8bc115011cf90734b5
parent 1e05bed931dd4ee29c93e9d910394333d8fc5c05
parent c05656e15c08c88f7e6b1f9bd5c7cb3ad5850797
author Tao Bao <tbao@google.com> 1562795176 -0700
committer android-build-merger <android-build-merger@google.com> 1562795176 -0700

Merge "minadbd sends heartbeat to rescue service for getprop command." am: 89cc79cbb6 am: d9ec0bbd06 am: bf57406110
am: c05656e15c

Change-Id: I292fec22ddf06d3006886c515539a0f460b89fe7