tree baa1c6a830cfc4d4b32afa216f454f3304188417
parent 12dff7c4924180856395a2eb65d52ff5244cd517
parent e03d27eed9ab32a7895d2e12d293d0ac35db9d33
author Hector Dearman <hjd@google.com> 1520864643 +0000
committer android-build-merger <android-build-merger@google.com> 1520864643 +0000

Merge "traced_probes: Fix naming of sink" am: 690a712941
am: e03d27eed9

Change-Id: I5ed31a4abfd24681d19086a9c95be3b0713bada1