diff options
| author | David Su <dysu@google.com> | 2020-10-07 10:16:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 10:16:54 +0000 |
| commit | c32e8960e084b4a62ac325cbaa0d3a03a2048c11 (patch) | |
| tree | d0e571c7c82489752f5c6691e0032241ff7f587f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6e4df6b781bae8f24901ced98bdde932569de3e0 (diff) | |
| parent | d02585b9887e2cf212315c9b8d66b4758803abf7 (diff) | |
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours am: 81e1bdcb6f -s ours am: 5ddf8dd40a -s ours am: d02585b988 -s ours
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: I04780d626e24feeea91425db6177d181750c4ee8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions