Merge branch 'tizen' into da-leak 31/33531/1
authorseokgil.kang <seokgil.kang@samsung.com>
Tue, 13 Jan 2015 05:19:18 +0000 (14:19 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Tue, 13 Jan 2015 05:19:18 +0000 (14:19 +0900)
commit7df7b331b4fa2e59357ecba3e3d6f3b7573ccde4
tree1f63c0574d8c7ac050be1a97ae59f70baef944fa
parentaac595241242eda0e69b9aeb71cfe31f60e95d91
parente036cf1d1685797a651e068bc96aa2417ccc7550
Merge branch 'tizen' into da-leak

Conflicts:
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/LeakTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java

Change-Id: I0950bad4723be3dcd087de2570eb71a37a78a143
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java