From: Chris Craik <ccraik@android.com>
Date: Thu, 7 May 2015 16:34:00 +0000 (+0000)
Subject: am 05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"
X-Git-Tag: android-x86-7.1-r1~1005^2~31
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9a104951a387a84709705405732a69f690d2c9f0;p=android-x86%2Fframeworks-native.git

am 05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"

* commit '05815996c965b99c4cc4ea96f6b6c4a9123cdf1c':
  Added Voltage and Current regulator ftrace events to atrace
---

9a104951a387a84709705405732a69f690d2c9f0