From: Ian Rogers <irogers@google.com>
Date: Sat, 12 Jul 2014 01:42:08 +0000 (+0000)
Subject: am 070dfc4c: Merge "Fix tracing."
X-Git-Tag: android-x86-6.0-r1~145^2~2834
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eb97d87d62ee3c4e9f8f396dd05912178be35d58;p=android-x86%2Fart.git

am 070dfc4c: Merge "Fix tracing."

* commit '070dfc4cebb9772a646382be9751d8f4c6b7d69a':
  Fix tracing.
---

eb97d87d62ee3c4e9f8f396dd05912178be35d58