tree 43cdf115a2cb95f9cf9b6db4bab98e336953d6ba
parent 387abed12941264c5e33f655fec2370fe69d82f8
parent a2285a6a3ef15470c0bb32ff71c09aa0c585caab
author Tao Bao <tbao@google.com> 1485305942 +0000
committer android-build-merger <android-build-merger@google.com> 1485305942 +0000

Merge "healthd: Track the API change of minui/minui.h." am: fb8c70cf4b am: 93e35655c4 am: bf90005832
am: a2285a6a3e

Change-Id: I6573b527bd7d405203d2e8fd063358ad031065a1