diff options
| author | David Su <dysu@google.com> | 2020-10-07 07:48:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 07:48:55 +0000 |
| commit | 0bf831141b7a64e8beef73cb3e1db2890bea8601 (patch) | |
| tree | 2e5b211674c5abd0545f0ade3f494fd4d47fc3fb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a4f3ed14d57e4b7adcf9e80cb65a30a80d902700 (diff) | |
| parent | 63549d18375e0aec137bc2e26e661c1ae8aa257a (diff) | |
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours am: 8a936e088d -s ours am: b9edc63f80 -s ours am: 79148d590a -s ours am: 3c8124a242 -s ours am: 63549d1837 -s ours
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621
Change-Id: I4fe6fa8db34677b9f7b03338f6d26fcfaf69280d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions