tree 8f8561865f67ef371ae7072ca6e2ed62e7757ea1
parent 3440f136385118666cd5b3a275c693bfdb5f2c2e
parent 588e5dda2a071d0d01953819a74b91a8fc3b396f
author Andreas Gampe <agampe@google.com> 1516242873 +0000
committer android-build-merger <android-build-merger@google.com> 1516242873 +0000

Merge "Perfprofd: minimal quipper fix for PERF_RECORD_THROTTLE" am: bc0c17b7ce
am: 588e5dda2a

Change-Id: Iaf82609bdb29a4b5305c8e87e5dae87deb146dde