tree 017be2de2c878b4aba030b9ff45deb84aeaf75f7
parent 9657c85714bfd7c950add42b5a22b1ac5667bd53
parent a8e0dabdaab565369917e131d45f39f564bf2fb7
author Borjan Tchakaloff <borjan@fairphone.com> 1513326088 +0100
committer Borjan Tchakaloff <borjan@fairphone.com> 1513331885 +0000

Merge branch 'fp2-m-sibon' into branch 'prebuilts'

Sync diverging branches after erroneous cherry-pick on fp2-m-sibon.

Change-Id: If588fcbdf590f8ef5cd322062e87b353d0c20207