tree 33db7c9a67f901be0ec9d5c1247cb797084ba1d3
parent 50f1e17dbe57177a90cdbf6be76b50f7c109012d
parent 5f6132f7401cd11ff972968dae8695674950ec57
author Kodi Obika <kodiobika@google.com> 1566354884 -0700
committer android-build-merger <android-build-merger@google.com> 1566354884 -0700

Merge "Added trace event to screenrecord" am: e9239dbe79 am: 1dd33eacee am: ea826c6eb1
am: 5f6132f740

Change-Id: I8c4b582568f740c953e588f1e2194aedd549fb70