tree c18bccf1ac93df9d2736f2bb3a0ade12118a466e
parent 64114ddf2ef05ebf6f571851e833fe5594899e31
parent ea69a18cd42bf757d49d733401f4ca6aa3994dc2
author Chris Phoenix <cphoenix@google.com> 1485204806 +0000
committer android-build-merger <android-build-merger@google.com> 1485204806 +0000

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

Change-Id: If08bbb1e45369083dcbea731005b035f026c238d