Merge branch 'tizen' into for_lcov 88/185288/1 for_lcov
authorVikas Kumar Agrawal <vikas.ag@samsung.com>
Fri, 27 Jul 2018 16:22:01 +0000 (21:52 +0530)
committerVikas Kumar Agrawal <vikas.ag@samsung.com>
Fri, 27 Jul 2018 16:23:51 +0000 (21:53 +0530)
Change-Id: I05a7924f095e2a0aba7a80ff931d79df2af96b09

1  2 
src/attach_panel.c
src/grid.c
src/ui_manager.c

Simple merge
diff --cc src/grid.c
Simple merge
Simple merge