tree 9d5f5f55f2fc50a9287d24b462d5b9ac7e590545
parent b7dc8c85ce8c05cc9c47bc8fb7f25ce795480453
parent c311b4859dd666cd7141686e4adf9d67b732f3fa
author Paul Duffin <paulduffin@google.com> 1617898924 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617898924 +0000

Merge "Fix build error due to null annotations in core platform API" am: ddbce35345 am: 8ec9292427 am: c311b4859d

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1670005

Change-Id: Id88ffd24b071e2faddeea67b522ff665f4c25549