commit | 663e6f1fe7c01a7efceb1a054b79d2175246b90b | [log] [tgz] |
---|---|---|
author | Alison Cichowlas <asc@google.com> | Fri Oct 09 15:09:48 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 09 15:09:48 2020 +0000 |
tree | f9057c7031fd5715ae0f66eefed27fdae50a6966 | |
parent | 38db37fab638b58c390f0ea0ed71c73ecca04494 [diff] | |
parent | 2b042ed4ae174f9dea3c3a15885651a2886e1ed0 [diff] |
[automerger skipped] Merge "Fix handling of bad image previews." am: 9e388035c9 am: 737107bb76 am: dcd9e4e8bb -s ours am: 2b042ed4ae -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: Ied821a19f0ded521de3d3bf8e5ca25fc1b42221f