commit | 50ed736e6915770fd8fc40400784dc16f49eb6c6 | [log] [tgz] |
---|---|---|
author | Paul Duffin <paulduffin@google.com> | Thu Apr 08 17:05:06 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 08 17:05:06 2021 +0000 |
tree | 9d5f5f55f2fc50a9287d24b462d5b9ac7e590545 | |
parent | 2867a201c365e125eeead15d04a2e535dcab7214 [diff] | |
parent | e8d7d82d7658d699c03c8b3b377320d2ecdc53b6 [diff] |
Merge "Fix build error due to null annotations in core platform API" am: ddbce35345 am: 8ec9292427 am: c311b4859d am: e8d7d82d76 Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1670005 Change-Id: I0ac9d8699ce7d19543791ee731d524f95f09071d