tree 6cce97f4c06f7f984a2ec20a920ca097ae60114d
parent f9a2f996bf282d01083cd8da03fa461856c12806
parent d9ec0bbd0658cf1d98675b1dba6a40c63b78a841
author Tao Bao <tbao@google.com> 1562792998 -0700
committer android-build-merger <android-build-merger@google.com> 1562792998 -0700

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

Change-Id: Iddc44d7ae5eda8686713871046a713207e86f91b