Merge branch 'tizen' into acr2 62/82762/1
authorDariusz Michaluk <d.michaluk@samsung.com>
Fri, 5 Aug 2016 13:01:19 +0000 (15:01 +0200)
committerDariusz Michaluk <d.michaluk@samsung.com>
Fri, 5 Aug 2016 13:05:46 +0000 (15:05 +0200)
commit49584d32282e36111d3c93dcaf96bd75b5f71359
tree7c23b6487c8d6518fc4e5c17877b879276159685
parent1cc57e574a498f8d0ff09abe0fb696862cc3ec75
parent209afea7ec7b47dbe72e437b3f585d2d733c1b14
Merge branch 'tizen' into acr2

Conflicts:
api/yaca/yaca_types.h
src/encrypt.c

Change-Id: I37798f950774aebc56c8bc7f7e6479e5887b13d4
api/yaca/yaca_types.h
src/encrypt.c