[automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours am: f6c384ae85 -s ours am: 2a711e9a34 -s ours am: 66a3bca939 -s ours am: f98d6a7dba -s ours
am skip reason: skipped by user schfan Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591189 Change-Id: Ic34b36e6f25b8ce401f10293b2b67b8a4b03d971 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: