tree 1965e491d5fc6dc282fd96dd72ce2b72379a7f2e
parent 8fa317e52a4581ef94ffd730f03e581d52f6fd32
parent f50aa9464f8f9cfc4dd56bcf7de01987774f0029
author Connor O'Brien <connoro@google.com> 1476986157 +0000
committer android-build-merger <android-build-merger@google.com> 1476986157 +0000

Merge changes from topic 'boot-control-hal'
am: f50aa9464f

Change-Id: I0f139fe08524d54328f2a3540f6683d65288743f