| commit | dd9d4ff93e13bef785722cc7110abcc7a809ed32 | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Tue Apr 20 22:56:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 20 22:56:44 2021 +0000 |
| tree | decf72c53100e63fd6de26dd7da434354d78ebc4 | |
| parent | d298b47ae198d4c977c29a394bd2dd6a06dbbf7e [diff] | |
| parent | a655f680d2b96ba6ebefaecfbb3d237958ec9c7a [diff] |
[automerger skipped] Merge "Fix build error due to null annotations in core platform API" am: 9234c21fa1 am: 865efafcb5 -s ours am: a655f680d2 -s ours am skip reason: skip tag Change-Id I83e3071f851720a9f719cb226f0e84fd731a8f37 with SHA-1 fc7efcbaa6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682027 Change-Id: Ia1c222abf32e4289cc574b995c5813de1c64e0d6