commit | a3765149ac52b75b33bc23f3b601194ddb4d756d | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Thu Feb 04 17:10:01 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 04 17:10:01 2021 +0000 |
tree | 840402e94964caea51a8f00e67ac1f75033cfdd6 | |
parent | d68bee2746eff2f62299dcf525ebd6d4b1f10440 [diff] | |
parent | af14107e13bb4f131f1474d6efc69857cef813af [diff] |
[automerger skipped] Merge changes from topic "nullablecollection" am: 60f3d5cee4 am: 57dd6872fd am: af14107e13 -s ours am skip reason: Change-Id I5ce70d3e622fcdd13d63d47bf483507378a60e16 with SHA-1 c042e7c643 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567165 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic3cca4dfc5d551377307b4393ca8e2b3aa06318c