Merge "health@2.0: Add vts tests."
authorYifan Hong <elsk@google.com>
Thu, 5 Oct 2017 21:42:11 +0000 (21:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Oct 2017 21:42:11 +0000 (21:42 +0000)
am: ac01ed1ae4

Change-Id: I60051c64808516cf87bf7f0b93134d577f20076d


Trivial merge