tree 26d4dcd760de6af6b44421b48aa57bcbe9c3ce28
parent 97033134d0b4e394861f222b178ebc9987f35e72
parent 5549004ed039df3f9efc5bc7d203fa68806266c8
author Primiano Tucci <primiano@google.com> 1522356379 +0000
committer android-build-merger <android-build-merger@google.com> 1522356379 +0000

Merge "Migrate filesystem ftrace events from userdebug." am: 79babbde0a
am: 5549004ed0

Change-Id: I98cbad2150e23a485da05134ecaa36c262ac2889