tree 741aa853e7dff2ccc50fa7082f743913240d038a
parent 9dd19a4b8316a0439ae44df427ce28bc53156db1
parent 2ed536a7b6ce5188f899ee6c633b608a4f154bf4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581591395 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581591395 +0000

Merge "Add Intdef annotation for eventId in logEvent" am: 2ed536a7b6

Change-Id: Ic9b5ea605164340d5c2461eb7a1a752bb5b36bad