[lng-odp] [Bug 1617] Build fails on api-next branch

2015-06-05 Thread bugzilla-daemon
https://bugs.linaro.org/show_bug.cgi?id=1617 --- Comment #1 from Petri Savolainen --- Also Git log documents a merge conflict commit 0da7ce4d558dfe63e9f42ace43e61b7fcdd56b09 Merge: 03181a7 1da1a0d Author: Maxim Uvarov Date: Thu Jun 4 20:14:58 2015 +0300 Merge branch 'master' into api-nex

[lng-odp] [Bug 1617] Build fails on api-next branch

2015-06-11 Thread bugzilla-daemon
https://bugs.linaro.org/show_bug.cgi?id=1617 Mike Holmes changed: What|Removed |Added Resolution|--- |NON REPRODUCIBLE Status|UNCONFIRMED