tree 641c10d3f1b5e83559f90ee44dd58f83eb1a50c8
parent 76288ca6b55fb9d048ec2a373d73cd117424b6cf
parent 804d42f1ef3834433c9473d726b8bda55fe0e0ac
author Wu Ahan <ahanwu@google.com> 1591209253 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591209253 +0000

Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e166 am: 804d42f1ef

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

Change-Id: I81d396dcd42fccff04b84978dabaa5c904007d5c