tree 05fddc49dd14d0e39f51bbd5d0ed5303222d101b
parent 595124a441f98d1ddad88466b644d109de6ddbe0
parent fa82f9c4e15ebc27fb18ac3fcc2ba6d801a264b0
author Yifan Hong <elsk@google.com> 1534292426 -0700
committer android-build-merger <android-build-merger@google.com> 1534292426 -0700

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

Change-Id: I876ff09e15f4e1107c8a37faae7baa7b0f0df1d8