tree c01492098b4ec202343c4652d51adeed4083b90f
parent 0e2ef88de2f805df4f0a31991bd22515fbebd596
parent 73bf7a040ffc500ae9339bd9e71ab8b06f4839c4
author Jesse Hall <jessehall@google.com> 1532726221 -0700
committer android-build-merger <android-build-merger@google.com> 1532726221 -0700

Merge "atrace: Add mali_systrace ftrace events to 'gfx'" am: 499ee25407
am: 73bf7a040f

Change-Id: I7f201ee7613cd9f8820b2a2a48d07508aed02227