tree bb70a088c23ff86eda334f8d13caab94d132ea1d
parent dea8c5b13077e5cbfcbe606a47c8719f69fd0d9d
parent 1dcede7ae304dc702927702faaa14aed080b6cb1
author Treehugger Robot <treehugger-gerrit@google.com> 1642823266 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642823266 +0000

Merge "simpleperf: fix EventFd::Id()." am: c393ae9015 am: 1dcede7ae3

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1957192

Change-Id: Ifc78da4ab9dbffd7783790949c849f5c8de55bbf