tree 5fc687e64ffa3beb387e0f8438404de97890273f
parent 5eeba5f485ba206a168657800a574c2b02f63576
parent 92c8e43252d2fb74882fff53bf5e4cc170778585
author Treehugger Robot <treehugger-gerrit@google.com> 1586538484 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586538484 +0000

Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252

Change-Id: Ibf814e81ca984b47b9be1e423e2cde908cf7f193