tree ebbdd5a900ac418c8e6a89df89f3fe044665c8a1
parent b87becf1c2a0a00341577061d389f307552748ed
parent 116fb89f70649ba933c975c83317def153eb4177
author Yifan Hong <elsk@google.com> 1507266563 +0000
committer android-build-merger <android-build-merger@google.com> 1507266563 +0000

Merge changes from topic "health2-hal"
am: 116fb89f70

Change-Id: Iaf211b338d946619ec6a5daecd02ee85a4648589