From: Eunji, Lee <eunjieji.lee@samsung.com>
Date: Tue, 9 Jun 2015 01:56:59 +0000 (+0900)
Subject: Merge branch 'master', remote-tracking branch 'origin/tizen' into tizen
X-Git-Tag: submit/tizen/20150609.034701^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c71aa2051fb4a6e9e3b55873dc16ff79988e426;p=tools%2Fttrace.git

Merge branch 'master', remote-tracking branch 'origin/tizen' into tizen
---