Konstantinos Menychtas e9a8f46585 resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev ... Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5		2015-08-25 17:26:22 +00:00
..
board	resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev	2015-08-25 17:26:22 +00:00
product	core_base.mk: switch to new H264 and MPEG2 software codecs	2015-04-16 19:02:47 -07:00