tree b2ca5957c8cdbf8174c2b2f60d3efab9258002aa
parent 651840fc6444f835280dd8f38dc5bee9f520a62d
parent 6a35ac122248e616802afeaa9682c13114b0a2ff
author JW Wang <wangchun@google.com> 1649209838 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649209838 +0000

[automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours

am skip reason: skipped by user schfan

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

Change-Id: Ibfe819cfb2547213a228b291f3e91ed261a73b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>