tree 77dbc1f0a467fce0a676840a8062b9cf53de2adb
parent d2b1e7ca5fa8ad3cabe6400c3262b2f825d002b6
parent 8402d76412a3621fab615d71d8221aa58f65f70b
author Hector Dearman <hjd@google.com> 1510917323 +0000
committer android-build-merger <android-build-merger@google.com> 1510917323 +0000

Merge "Re-jig ftrace controller again"
am: 8402d76412

Change-Id: I9f3a1c4829bd2b4cff0f1fbced1785e0c8d38971