Merge branch 'tizen' into acr2 54/81654/1
authorLukasz Pawelczyk <l.pawelczyk@samsung.com>
Wed, 27 Jul 2016 11:59:46 +0000 (13:59 +0200)
committerLukasz Pawelczyk <l.pawelczyk@samsung.com>
Wed, 27 Jul 2016 12:00:30 +0000 (14:00 +0200)
Change-Id: Ia478aa4239140e591b05cf58d261bee4a716d6dc

1  2 
api/yaca/yaca_types.h
src/internal.h
src/key.c

Simple merge
diff --cc src/internal.h
Simple merge
diff --cc src/key.c
Simple merge