diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-07 15:52:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-07 15:52:01 +0000 |
| commit | 95fbe3a3898531d5b741f5c3ac698380f9f7e013 (patch) | |
| tree | 39de691a3567df02a9b3e3b6d5a31fee2d383a96 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | adfd9cea34fad49f7679120e270bced987e38bf2 (diff) | |
| parent | 9bf0157d5fb62a10cc006dc2154eba71cc678dac (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Fixing unsafe pending intent in notification" into qt-dev am: bfc095df4f am: ec3f123bf9 -s ours am: 9bf0157d5f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727764
Change-Id: I3a5b575c43fc32aded0aa0add5ad04492bb4b4b0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions