tree 43d50085cfb7f791ae4d4034b08426b182016b80
parent 7bd8b94f28f39122a3276e46c2ea4036d4a4ab48
parent e2c473d2021b35c2d5df909bbb7a28061eaf56fd
author Jesse Hall <jessehall@google.com> 1532726642 -0700
committer android-build-merger <android-build-merger@google.com> 1532726642 -0700

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

Change-Id: I6f4ab78031f15c5f918583208c2760bab78aaa42