tree 1f60a2b807a88d8acf99abd43aad17e0837bc012
parent c037ca7fb1c0163c58e8707d1184bb73aabc0730
parent 05815996c965b99c4cc4ea96f6b6c4a9123cdf1c
author Chris Craik <ccraik@android.com> 1431016440 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431016440 +0000

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

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