tree f8cf660ccc7d07665948532925e7c494b355fadd
parent 2551f7859a4ec1d2b384ec1c729c62d90b21a9ff
parent 2aa691bedb0282d9c4f2e7626fecad1026939d7e
author Karsten Tausche <karsten@fairphone.com> 1563376170 +0200
committer Karsten Tausche <karsten@fairphone.com> 1563377074 +0200

Merge tag 'LA.UM.5.8.r1-02900-8x98.0' into int/n/fp2

"LA.UM.5.8.r1-02900-8x98.0"

* tag 'LA.UM.5.8.r1-02900-8x98.0':
  bootcontrol: Only compile when the A/B feature is enabled
  bootcontrol: Reduce the number of writes in the set active slot function
  bootcontrol: Update a check in set_active_boot_slot
  bootctrl: Fix implementation of get_current_slot
  bootctrl: Initial commit for the boot control HAL
  init empty file

Conflicts in Android.mk. Solved by taking CAF version.

Issue: FP2N-105
Change-Id: I8f3c19a657d748ed239ff510bd706ff6bf541283