tree c1a9e5949b683e30930d27ed721d5757e9f3812d
parent dae77669aacfb1c96add145e67fa3995d793b248
parent 9e388035c93bd693f6bbef92b1a008728da98c9f
author Alison Cichowlas <asc@google.com> 1602252147 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602252147 +0000

Merge "Fix handling of bad image previews." am: 9e388035c9

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

Change-Id: I56d8c73381d357b76928519b2d50f56e7ba3a931