Fixed merge error 71/37871/1
authorPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 14:38:12 +0000 (15:38 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Tue, 7 Apr 2015 14:38:12 +0000 (15:38 +0100)
commit5364e8da83550f0a7f6431739f882ff2aef57bdc
tree8b8cb4d5c3d62d218214d21f3b1b953b28f236a3
parentecca9a6b2bab7cdeac8763d2f6be63e1b371d768
Fixed merge error

Change-Id: I90565d7292bbe2fbfea3ed09220bdb001d65c4fe
build/tizen/adaptor/Makefile.am