tree 51373844c45d9fd879d94af62f96ef0e314eee77
parent 2653fea4c7e73c25394e72a491c87c9fd52c67e8
parent d8f0a1eb93d0c36cb260361b542bf3044b36aff4
author Fabien Sanglard <sanglardf@google.com> 1499964753 +0000
committer android-build-merger <android-build-merger@google.com> 1499964753 +0000

Merge "Inferno: A framegrapher based on simpleperf" am: af30023228
am: d8f0a1eb93

Change-Id: I595ef7ed445cd973d413ac8f712d4ff8b67fff14