OSDN Git Service

Merge "Inferno: A framegrapher based on simpleperf" am: af30023228
authorFabien Sanglard <sanglardf@google.com>
Thu, 13 Jul 2017 16:52:33 +0000 (16:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Jul 2017 16:52:33 +0000 (16:52 +0000)
am: d8f0a1eb93

Change-Id: I595ef7ed445cd973d413ac8f712d4ff8b67fff14


Trivial merge