OSDN Git Service

am 9a104951: am 05815996: Merge "Added Voltage and Current regulator ftrace events...
authorChris Craik <ccraik@android.com>
Thu, 7 May 2015 16:45:29 +0000 (16:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 May 2015 16:45:29 +0000 (16:45 +0000)
* commit '9a104951a387a84709705405732a69f690d2c9f0':
  Added Voltage and Current regulator ftrace events to atrace


Trivial merge