OSDN Git Service

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

Change-Id: I7f3c76af95c049425985b6dd89d00c75dfe24c80


Trivial merge