Merge changes from topic "health2-hal"
authorYifan Hong <elsk@google.com>
Fri, 6 Oct 2017 05:09:23 +0000 (05:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Oct 2017 05:09:23 +0000 (05:09 +0000)
commita8ed405b9de4b04e4bbe996c5960b4f4c50bcbb1
treeebbdd5a900ac418c8e6a89df89f3fe044665c8a1
parentb87becf1c2a0a00341577061d389f307552748ed
parent116fb89f70649ba933c975c83317def153eb4177
Merge changes from topic "health2-hal"
am: 116fb89f70

Change-Id: Iaf211b338d946619ec6a5daecd02ee85a4648589