tree 3d44fee9599ae002a20329bc27c1823f2d1a680e
parent ae9661a4f63ffc33a4fbbd28635c7c88f71bcb20
parent 82ec7bcf4e6967440774e4b0bceea46c35066784
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581593083 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581593083 +0000

Merge "Add Intdef annotation for eventId in logEvent" am: 91b05f7f58 am: fc7a1308cd am: 82ec7bcf4e

Change-Id: I7caa207fb35e8088e50de0651a72a6d9628e7ce2