[automerger skipped] Merge "DO NOT MERGE Prevent ImageWallpaper from keeping crashing" into oc-dev am: c34919e166 am: 804d42f1ef am: 172a0954c5 -s ours am: b8e311740b -s ours am: 95c4e942dc am: 170465e0a2 -s ours am: 27c4aef372 am: 9948425ec5 am: 56e2b96ef7

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

Change-Id: I237ac4e555b6659b61f0b1f462ada1b1f1c6e0ab
This commit is contained in:
Wu Ahan
2020-06-03 19:41:47 +00:00
committed by Automerger Merge Worker

Diff Content Not Available