Merge remote-tracking branch 'origin/tizen' into da-opengl 85/24585/1
authorHyunjong.park <phjwithyou.park@samsung.com>
Thu, 17 Jul 2014 01:56:16 +0000 (10:56 +0900)
committerHyunjong.park <phjwithyou.park@samsung.com>
Thu, 17 Jul 2014 01:57:39 +0000 (10:57 +0900)
commite053471609c9cd115c28fdb19caea348455e77e8
tree565d1ddbe9229074752a2d75ec54159de2394d6b
parent4f93adc56eebbfaed9d7c5d38f19dce0e38e9f69
parentad3ed64c57bde32e1c74a3ad58719027c8056c46
Merge remote-tracking branch 'origin/tizen' into da-opengl

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLStateProgramDBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java

Change-Id: I119b85750e7dee045e7235063334a4a07774d55b
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBConstants.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java