Merge changes from topic "health21" am: a1e654d8f1 am: 43952e9e56

am: 9c1328bb49

Change-Id: I3a89e4f49f246839a46aa7592b9fe57009160ee9
This commit is contained in:
Yifan Hong 2019-10-23 18:44:24 -07:00 committed by android-build-merger
commit 74f5618690

View file

@ -221,7 +221,7 @@
</hal>
<hal format="hidl" optional="false">
<name>android.hardware.health</name>
<version>2.0</version>
<version>2.1</version>
<interface>
<name>IHealth</name>
<instance>default</instance>