Merge branch 'devel/master' into tizen 79/127779/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 01:18:35 +0000 (10:18 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 2 May 2017 01:18:45 +0000 (10:18 +0900)
commit02ecaf0ebaf2fb4512f8f57190840812b98730d4
tree22713346e0f7f6b17cd5671635a0a27e2b66844b
parentdaf2fa7782b78d722a6628fc36089980ea14f013
parent22e6327dbd2567e2ad6163ba838dcbac5da5c470
Merge branch 'devel/master' into tizen

Change-Id: Idf8019b23a2d2f00c2f954dbf8f24d59e8a44371