diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-02-09 18:11:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-09 18:11:14 +0000 |
| commit | 4faa1e11cecb3191c8e3d299561bdcc2c46474be (patch) | |
| tree | ae3d55ede2977fb5918eec6858a52a4006f9d9a0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6e59db19528398cdf24f4015112e885571d00a6b (diff) | |
| parent | 0dd3315653270366b3c3ec5b6f079ee9d95969ec (diff) | |
[automerger skipped] Merge "Security fixes for PendingIntent related apis in LauncherApps" into sc-dev am: 7d43598fdf -s ours am: 0dd3315653 -s ours
am skip reason: Merged-In Id262b9a0de58d8834c85d925cf84bb44b8b99742 with SHA-1 e41e04bb8c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16778744
Change-Id: Id4026f5cac9aea066833c304fe079ede3a8d7f10
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions