tree 3d44fee9599ae002a20329bc27c1823f2d1a680e
parent 8873937547906f26a336b105cbb889d2a301e468
parent dd266913394bde877b38b86843c58e7ba4223d1f
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: 2ed536a7b6 am: ef5b92c7d2 am: dd26691339

Change-Id: I7caa207fb35e8088e50de0651a72a6d9628e7ce2