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

Merge branch 'tizen' into da-leak

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java

Change-Id: I03fe37195d7db2e76095282cb24ceae450e6f8ad
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>

author	seokgil.kang <seokgil.kang@samsung.com>
	Mon, 15 Dec 2014 08:59:25 +0000 (17:59 +0900)
committer	seokgil.kang <seokgil.kang@samsung.com>
	Mon, 15 Dec 2014 08:59:25 +0000 (17:59 +0900)
commit	da3d23dfb49e3d99f07bf72a7a9f7c273f96220a
tree	4bdaf5a4f74119d6cbdb58d55820522340f5291b	tree \| snapshot
parent	384c5f9b6a125ba05d6d1c981170132ba5fbac7d	commit \| diff
parent	01da20b4666ffcad0a5c96eb02d8cda8fd8d2449	commit \| diff

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java	diff1 \|	diff2 \|	blob \| history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java	diff1 \|	diff2 \|	blob \| history