tree 05fddc49dd14d0e39f51bbd5d0ed5303222d101b
parent 486280705481df440a7639609439008061abf8f1
parent c7c56f0e90cb8cd640c219cd6796d79479843ad7
author Yifan Hong <elsk@google.com> 1534287467 -0700
committer android-build-merger <android-build-merger@google.com> 1534287467 -0700

Merge "recovery uses IHealth::getService" am: ce2f0d85fb
am: c7c56f0e90

Change-Id: Ib96bc483a80a35a0b405c82cf623dfe7c2157ff4