| commit | bc34a8e5b1b27704ef2aeab87cb93c8293c05840 | [log] [tgz] |
|---|---|---|
| author | Alison Cichowlas <asc@google.com> | Thu Aug 13 15:18:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 13 15:18:10 2020 +0000 |
| tree | 2af2c70bdee38dfeb8d81a080d37663a63c6ab04 | |
| parent | 5753aacee17ef3cdb46d8ad159a82220f32bb98e [diff] | |
| parent | 0263d0ddee64fd07a045007d4f37f1719379f5fc [diff] |
[automerger skipped] Merge "Show the nearby chip for images and files too." am: bd8e5ae31c am: 6ff4300aa1 -s ours am: 0191494230 -s ours am: 86050129a0 -s ours am: 0263d0ddee -s ours 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: I9a9345cc22820066fb7e31197537d1a7c0a698c5