tree 6c9da9385c5b3db33feeaf4c0a12d38a258ee8a2
parent fedd3609add137007bb5131558725f89434bb02d
parent 21640f381f369a970615c8ca9ff1ba56c5ac8f0e
author Richard Uhler <ruhler@google.com> 1574705893 -0800
committer android-build-merger <android-build-merger@google.com> 1574705893 -0800

[automerger skipped] Fix NullPointerException. am: b4bad064d8 -s ours am: d0654a76f3 -s ours
am: 21640f381f -s ours
am skip reason: change_id Ic007e44264647793c6271c3923c13c9e1736a9de with SHA1 17bfed91cc is in history

Change-Id: Ibd1dc1c5eca49cd0261693018598a6df2983eeed