Merge branch 'tizen' into da-function 34/29634/1
authorwoojin <woojin2.jung@samsung.com>
Fri, 31 Oct 2014 03:07:23 +0000 (12:07 +0900)
committerwoojin <woojin2.jung@samsung.com>
Fri, 31 Oct 2014 03:07:23 +0000 (12:07 +0900)
commit1f45c6407eaf18be87bccb46250045bea7b4942d
tree83484dea9f34be86be50b776ca4e700e9f936013
parent6a78ec1ccde8b4e9612eb7e2048d7843d5f24ec7
parent23043018dce83c822ee084f017ead42626047d4d
Merge branch 'tizen' into da-function

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DALimit.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfilingChildDataDBTable.java

Change-Id: I65d98fc797e6f092708838fc8c7639319e8498e9
Signed-off-by: woojin <woojin2.jung@samsung.com>
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DALimit.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfilingChildDataDBTable.java