diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-11-03 02:13:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-03 02:13:46 +0000 |
| commit | 917fc5a878ce2fd3e27a1ab6a53d0d2fc3c1e441 (patch) | |
| tree | 32762414ba167b44f19c4bce354636ada53fe59c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f6bd60e26206e1ee148caec9413918a9d5c5a937 (diff) | |
| parent | 4453859c7fc11e69d361fbac09e653d517559d3d (diff) | |
[automerger skipped] Merge "Apply FLAG_IMMUTABLE to the PendingIntent in NetworkStatService.java" am: 2c0bf15a21 am: fd32ff54dc am: 5e2b1cecaa am: 4453859c7f -s ours
am skip reason: Change-Id I35ccfc0f69fd98b5803da74d9eb12902b351acc7 with SHA-1 eb04cb7be1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481721
Change-Id: Idadfa833e3b030df4a592207ddb7a89a028ecd4d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions