From: Eric Marsman Date: Fri, 4 Mar 2016 15:49:17 +0000 (-0500) Subject: merged next & conflict resolved on version number X-Git-Tag: 5.0.2~275^2~2^2~1^2~1 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=6f738d2197c2b010ace83e55c5073f743952f6b2;p=apps%2Fagl-service-can-low-level.git merged next & conflict resolved on version number --- 6f738d2197c2b010ace83e55c5073f743952f6b2