tree 5b66c25d8501a9a98b28e7154f4b62b5e6b755fb
parent b037cff12eedd61e9afc04ec4d60f4c399830d2e
parent cf1af460d59079645e6a94dec301e4eb48f1070c
author Chris Phoenix <cphoenix@google.com> 1485204803 +0000
committer android-build-merger <android-build-merger@google.com> 1485204803 +0000

Merge "bootctrl HAL uses "default" service name"
am: cf1af460d5

Change-Id: Iae6ad548a1f3d10864daf95c05db05e5277f52ab