[Eas-dev] android-4.9-eas-dev and hikey-linaro-4.9 merge conflicts

Hi,

I tried to update my branches but I'm facing a conflict issue [1]

I also tried with a clean tree and the conflict is still there.

Vincent had the same conflict.

Not sure from where the problem is coming, any suggestion ?

-- Daniel

[1] https://pastebin.com/uFhz2bwe

-- http://www.linaro.org/ Linaro.org │ Open source software for ARM SoCs

Follow Linaro: http://www.facebook.com/pages/Linaro Facebook | http://twitter.com/#!/linaroorg Twitter | http://www.linaro.org/linaro-blog/ Blog