tree cfd2ce589b803067d8114cd370c2796abc54b4c2
parent 8400135490cfe0147c5378c7607eed6cc2c972b5
parent 93e35655c497949c62e38c2a90eefc0224400cc9
author Tao Bao <tbao@google.com> 1485305767 +0000
committer android-build-merger <android-build-merger@google.com> 1485305767 +0000

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

Change-Id: Ic77cd6f293d2875e251def1e75aff33a612d7077