tree 0912a26f6f8a92493fe42e1390c3d62f79b154af
parent ff7a5ee9749659e810cc03454e7a14ec164573ec
parent 0c7a1a7c0d0d8ef8e70d741762fcc8f2a1ce606b
author Andreas Gampe <agampe@google.com> 1515544357 +0000
committer android-build-merger <android-build-merger@google.com> 1515544357 +0000

Merge "Perfprofd: Add functions in script" am: edb8ec27f3
am: 0c7a1a7c0d

Change-Id: Icfdc087e4d3ea520eaaa2de276fc5ac86c76d689