[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: 95c8cc5e77 -s ours am: fe89d5f644 -s ours am: 277a8cfc1d -s ours
am skip reason: skipped by user schfan Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591189 Change-Id: I98524b450e614f31401e4c0b822cd8480aa3a275 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: