tree 2ca2826b266ba1d3f15359ce85ee3aa21fa705ae
parent eb416f0256676df6502dba06b2ccf1b9579d17fc
parent dcd9e4e8bbb7ad67415a1851023bb199ef6d81e2
author Alison Cichowlas <asc@google.com> 1602255180 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602255180 +0000

[automerger skipped] Merge "Fix handling of bad image previews." am: 9e388035c9 am: 737107bb76 am: dcd9e4e8bb -s ours

am skip reason: Change-Id I49190c1fbc4e25b3d2e2802a90de355bff297f7e with SHA-1 208b157b8d is in history

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

Change-Id: Ice35b46ed100928b9827e68684131bdba03e4594