Handle conflicts from git merge release-20160315
authorSoonKyu Park <sk7.park@samsung.com>
Mon, 11 Apr 2016 06:24:24 +0000 (15:24 +0900)
committerSoonKyu Park <sk7.park@samsung.com>
Mon, 11 Apr 2016 06:24:24 +0000 (15:24 +0900)
commit89453d58de729caad7613a007b5dda9c19e7d003
tree40741dc528b6a5f546a4287124f8c523324e5910
parent9312c04f58c63883aa556124e618c16e531519a3
parent97a7db20d2297c9f66716057c20f19265751bfa7
Handle conflicts from git merge release-20160315
packaging/mic.spec