OSDN Git Service

Merge "simpleperf: fix ScopedEventTypes." am: d5c0d63fc1 am: b506415717
authorYabin Cui <yabinc@google.com>
Mon, 21 Oct 2019 20:56:29 +0000 (13:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Oct 2019 20:56:29 +0000 (13:56 -0700)
commit2a457705f7b02af153a06081be799829dc294da4
treed5edca38817aeceb72e7e236d7d17607829d0a8f
parent327e9b01c79c316f990bc5846f3d363027cb109c
parent30fa74af43edfcf59441704f6c1dd878dad51f8d
Merge "simpleperf: fix ScopedEventTypes." am: d5c0d63fc1 am: b506415717
am: 30fa74af43

Change-Id: Id49808831f3e2eda3fd1a0f2ed2b8794675bec0f