[automerger skipped] Merge "Show the nearby chip for images and files too." am: bd8e5ae31c am: 6ff4300aa1 -s ours

Browse Source

am skip reason: Change-Id If0c0b754a066b0ec439a866de3eae84caca7b793 with SHA-1 b18b59fd58 is in history

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

Change-Id: Ifc81acb7fc6a1fa64db0bbbf66d5be817a7282a1

...

This commit is contained in:

Alison Cichowlas

2020-08-13 14:40:22 +00:00

committed by Automerger Merge Worker

parent 3c8464e035 6ff4300aa1

commit 0191494230

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available