review.tizen.org Git - sdk/tools/dynamic-analyzer.git/commit

Merge branch 'tizen' into da-opt

Signed-off-by: greatim <jaewon81.lim@samsung.com>
Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBInserter.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogQueue.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinarySettingProgressManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopProcessManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java

Change-Id: Ia2b424c745bc47c723408c69a5fa35192952b6b8

author	greatim <jaewon81.lim@samsung.com>
	Tue, 24 Feb 2015 12:12:48 +0000 (21:12 +0900)
committer	greatim <jaewon81.lim@samsung.com>
	Tue, 24 Feb 2015 12:12:48 +0000 (21:12 +0900)
commit	2973bdcd401df16d6c901168df622c2d6116756f
tree	06908fc4718c4f4d3f505b14c6f28d9e9a763937	tree \| snapshot
parent	9a47faf3768e4b04f9a6e6867a6efffacdf46efa	commit \| diff
parent	12b6b66f2d1a12660b365c76a54efd53884ac182	commit \| diff

org.tizen.dynamicanalyzer.common/META-INF/MANIFEST.MF	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/build.properties	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/plugin.xml	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/SideWorker.java	diff1 \|	\|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java	diff1 \|	\|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StopTraceManager.java	diff1 \|	\|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBInserter.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBTable.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/CommandAction.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/AnalyzerLabels.properties	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessInformation.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/DataChannelThread.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/HeartBeatThread.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogParser.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ByteStreamData.java	\|	\|	blob
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ContextSwitchData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ControlData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/CustomData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/FileData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataUtils.java	blob1 \|	blob2 \|	history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/MemoryData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/NetworkData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ReplayData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SceneData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ScreenShotData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SyncData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ThreadData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/UIEventData.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/BinarySettingProgressManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotView.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataMaker.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiDataMaker.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataMaker.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/db/SyncAPIDBTable.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/db/SyncDataDBTable.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/db/SyncEventDBTable.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/db/ThreadAPIDBTable.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/db/ThreadEventDBTable.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replay/data/ReplayDBManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/test/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDBTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/test/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMakerTest.java	diff1 \|	diff2 \|	blob \| history