tree 890f3faeca9628d5427002c17df8ef7de7d333a3
parent f1a371b1b002d8ca19bb1ecf3d40547c52fa3706
parent ee3030ad4e90a71504e64cea597304cc23c27ed7
author Chris Phoenix <cphoenix@google.com> 1485205100 +0000
committer android-build-merger <android-build-merger@google.com> 1485205100 +0000

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

Change-Id: I58625313d404e8f7e947d324441ae9a51c4d0931