tree 5e6196b3dc36ca8f231aa431f7dc33edc0425a13
parent 3f9f18eaf18b9cd172df5a7504c59e1b20c76740
parent dcd3e8b46dd84013395d50a196838ba8004e24b4
author TreeHugger Robot <treehugger-gerrit@google.com> 1601059873 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601059873 +0000

[automerger skipped] Merge "Check for null when getting PiP action item drawables." into rvc-qpr-dev am: 369ecdd88c am: dcd3e8b46d -s ours

am skip reason: Change-Id Iff2b7d499cee275294075a37a4970dc2dbc97401 with SHA-1 e09e8e8a18 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664466

Change-Id: I30a85a68b380c7e442d3ca7930bcd6ddcbba60c8