diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-23 10:42:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-23 10:42:42 +0000 |
commit | b57cdddde95275baf3290129807dcd4635783f87 (patch) | |
tree | 3852aeaa32b18c336446028290dcd2fa506bfdb1 /rs/java/android/renderscript/ProgramStore.java | |
parent | 34f039682c4b2b5e57e0da687b67c21f3fedb13d (diff) | |
parent | dd0e72001ed9e25806405c2e31d2321b35e6b25b (diff) |
[automerger skipped] Merge "[RESTRICT AUTOMERGE]Don't finish noHistory activity while it is on the topmost." into rvc-qpr-dev am: 0015e454b6 am: dd0e72001e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12629532
Change-Id: I6eb63550d1d8cde56cfb6706e5f8a765244a14d8
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions