tree b8c63cee2ec9eedbc5b373de675fc70899f1f650
parent 7f4e5d55f4cdde472168fa4a4d8ed3294e942bc0
parent df141b938195afe64a41e84dab7d2a494e13b5db
author Alex Deymo <deymo@google.com> 1491348242 +0000
committer android-build-merger <android-build-merger@google.com> 1491348242 +0000

Merge "Boot control HAL based on the A/B headers." am: b5fca37976
am: df141b9381

Change-Id: I5e16931621728122fc265d8e6c1c904227de2385