tree b769fbe3bef6ce2da1e3cd511f95c665b50984a2
parent 3f7c238828879b17d0a6fd64706c3366107f6023
parent 9baac8ba8c809b13412d3e4174aa9039c862fd95
author Nathan Harold <nharold@google.com> 1551761928 -0800
committer android-build-merger <android-build-merger@google.com> 1551761928 -0800

Merge "Fix Protected Broadcast Name for DEBUG_EVENT" am: 31dd725598
am: 9baac8ba8c

Change-Id: I3b6d4b40e4f5edb52486b6b77c888ae2f53b5dcf