tree 890f3faeca9628d5427002c17df8ef7de7d333a3
parent 281fa9fd303bbc8eca423f1ceb28e38111ca0376
parent 58eace4a96784ee07bc9e64ba3c9072ff49449c1
author Chris Phoenix <cphoenix@google.com> 1485205942 +0000
committer android-build-merger <android-build-merger@google.com> 1485205942 +0000

Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e
am: 58eace4a96

Change-Id: I8b50cce19ece3b5082676c2ebb84164b78542544