Merge remote-tracking branch 'origin/tizen' into tizen_3.0 71/97171/1 submit/tizen_3.0/20161111.094850
authorchanywa <cbible.kim@samsung.com>
Fri, 11 Nov 2016 09:45:47 +0000 (18:45 +0900)
committerchanywa <cbible.kim@samsung.com>
Fri, 11 Nov 2016 09:45:57 +0000 (18:45 +0900)
Change-Id: I0e803f979f72c4cbdadaeed5a9346e8185edb0c5
Signed-off-by: chanywa <cbible.kim@samsung.com>

Trivial merge