[automerger skipped] minadbd sends heartbeat to rescue service for getprop command. am: dd0158ac60 -s ours am: e64e670fab -s ours
am:db13a9bb58-s ours am skip reason: change_id Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531 with SHA10bbb2ed53eis in history Change-Id: I7ffebae0e623793f0aed07eb7e5a73755ccf27ae
This commit is contained in: