tree c495878833982f1a123e751d6019fbbf6fcac538
parent 6e75f3f133508abab402167684253c335e26f07e
parent 3164f297fcb088f43174fe2186905a8d4f7623be
author Andreas Gampe <agampe@google.com> 1516059602 +0000
committer android-build-merger <android-build-merger@google.com> 1516059602 +0000

Merge "Perfprofd: Enable some more warnings" am: 3e4cd931cc
am: 3164f297fc

Change-Id: Id84458418c43161aa6fa086eb54f29ff84d51c51