diff options
author | Alison Cichowlas <asc@google.com> | 2020-08-13 14:40:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-13 14:40:22 +0000 |
commit | 0191494230003dcac393aa2e39a7cd097bce6807 (patch) | |
tree | 04a78c33e33fac45c6d316125f93adaf2e788352 /rs/java/android/renderscript/ProgramStore.java | |
parent | 3c8464e0356fc0a7b476380cf296babb178e4b94 (diff) | |
parent | 6ff4300aa1718086a224427dc4535def5603c6bb (diff) |
[automerger skipped] Merge "Show the nearby chip for images and files too." am: bd8e5ae31c am: 6ff4300aa1 -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: Ifc81acb7fc6a1fa64db0bbbf66d5be817a7282a1
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions