diff options
| author | David Su <dysu@google.com> | 2020-10-07 10:01:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 10:01:57 +0000 |
| commit | d02585b9887e2cf212315c9b8d66b4758803abf7 (patch) | |
| tree | 602a572544544207deee850eae003138558c5b38 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 998b69eedd5e67a3f0d6f49fa688099df77c8777 (diff) | |
| parent | 5ddf8dd40af7ac7af3cafe445fa2d3fc41bae2e3 (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 skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad2a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292
Change-Id: Id8576015fa0c90b4c82e36d9e667733ad08590f9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions