Merge branch 'tizen' into da-timeline

Conflicts:
	org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java

Change-Id: I2c931e29e70d7a1fc3b0180d3e64dc0361862255
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>

diff --cc org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java
Simple merge

diff --cc org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
index 2f16056,89f379d..7d1f9ec
--- 1/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
--- 2/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
@@@ -260,19 -238,10 +265,16 @@@ public class DAChartBoard extends Compo
                                int height = (int) (itemHeight * itemHeightRatio);
                                int nItemSize = rt.height / height + 1;
                                for (int i = 0; i < nItemSize; i++) {
 +                                      /*
 +                                       * draw nameCell
 +                                       */
                                        e.gc.drawRectangle(rt.x, i * height - 1,
                                                        DAChartBoardItem.DEFAULT_NAME_CELL_WIDTH, height);
-                                       e.gc.drawRectangle(
-                                                       DAChartBoardItem.DEFAULT_NAME_CELL_WIDTH, i
-                                                                       * height - 1, rt.width
-                                                                       - DAChartBoardItem.DEFAULT_NAME_CELL_WIDTH,
-                                                       height);
 +                                      /*
 +                                       * draw chartCell
 +                                       */
+                                       e.gc.drawRectangle(DAChartBoardItem.DEFAULT_NAME_CELL_WIDTH, i * height - 1,
+                                                       rt.width - DAChartBoardItem.DEFAULT_NAME_CELL_WIDTH, height);
                                }
                        }
                });

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java
Simple merge