| commit | a655f680d2b96ba6ebefaecfbb3d237958ec9c7a | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Tue Apr 20 22:26:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 20 22:26:27 2021 +0000 |
| tree | d12c58b6cbcf1aab3bf4b29ee8b9f39268163bbc | |
| parent | 62f75bd114e4a27f18dfdb49429761199f9a741c [diff] | |
| parent | 865efafcb52d6d2c0c819eeb5fe80ac4dcf6695d [diff] |
[automerger skipped] Merge "Fix build error due to null annotations in core platform API" am: 9234c21fa1 am: 865efafcb5 -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: Ib204dbaad44aff6c7a85c3f888355b93f16528a8