diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-07 16:08:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-07 16:08:19 +0000 |
| commit | b8ec3622e579c823333918d535daa00bdf1f51ff (patch) | |
| tree | d30fa3a4f7e896cd830c2aa178400f7f6435551a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d6d0192bcc906728577fa19f19a2397a688460f2 (diff) | |
| parent | 95fbe3a3898531d5b741f5c3ac698380f9f7e013 (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: 95fbe3a389 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15727764
Change-Id: I3c044354fd549fc82bec09816a66ec3298ae2a92
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions