Merge branch 'tizen' into da-seq 32/29032/1
authorgreatim <jaewon81.lim@samsung.com>
Mon, 20 Oct 2014 09:28:13 +0000 (18:28 +0900)
committergreatim <jaewon81.lim@samsung.com>
Mon, 20 Oct 2014 11:48:33 +0000 (20:48 +0900)
commitb32492dd368e388103c59a1f9cda0325bf4e5b79
treec50c0327a4cf33ea7fe91705ac944c691c9c1c6a
parenta24a4946efe189d6301f5bddee92e30539308351
parent4a5234e4b85ac732f6cdc10bb53319e6768bcbfd
Merge branch 'tizen' into da-seq

Signed-off-by: greatim <jaewon81.lim@samsung.com>
Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkAPIDBManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/type/NetworkAPIType.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLAPIDBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLFrameTimeDBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLStateTextureDBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLAPIData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataDBTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/RemoteDeviceManager.java

Change-Id: I77bb1861ab60ef833141aa4dc24fad49419a5fc5

Change-ID: Idf6925fbac5e5398f9dc536a01c923ca8362ae86
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java