From: Eunji, Lee <eunjieji.lee@samsung.com>
Date: Fri, 11 Sep 2015 00:56:11 +0000 (+0900)
Subject: Merge branches 'master' and 'tizen' into tizen
X-Git-Tag: submit/tizen/20150911.005803^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f661285fe32e89dcd348e50160594b32dfcc697f;p=tools%2Fttrace.git

Merge branches 'master' and 'tizen' into tizen
---