diff options
| author | Jeff Chang <chengjeff@google.com> | 2020-09-23 10:42:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-23 10:42:38 +0000 |
| commit | 34f039682c4b2b5e57e0da687b67c21f3fedb13d (patch) | |
| tree | 3852aeaa32b18c336446028290dcd2fa506bfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 30cca071bfafd0c02d7cc8b3e45da6b0d95028e6 (diff) | |
| parent | 0559b64472ea1b2b71e63046d7f6ad474c4f1311 (diff) | |
[automerger skipped] [RESTRICT AUTOMERGE]Don't finish noHistory activity while it is on the topmost. am: 59a51c6ba9 am: 0559b64472 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12629532
Change-Id: I7580fd5a8e6cf30d8fed64e241e65e78a0b006c1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions