tree 405098f31524a06b27508697bc7c9c0acb283fc8
parent 877cece3df40818e5f603f8bbd33950377265f69
parent de0af3c0fd0e1122d6feba2d28eb20fb40960dbb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591803199 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1591803199 +0000

Merge "Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b am: b9bd2da6f2 am: 0a55b64371" into rvc-qpr-dev-plus-aosp