diff options
| author | David Su <dysu@google.com> | 2020-10-07 08:01:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 08:01:46 +0000 |
| commit | 65a917dce90dabc9cda4863575a0794308f5fd79 (patch) | |
| tree | 683c2db6a8c334ed14821fce18e9e672498ed810 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c1cbf2dddec697043872ddd67abb6bec2cc474a (diff) | |
| parent | 0bf831141b7a64e8beef73cb3e1db2890bea8601 (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: 0bf831141b -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/+/12729621
Change-Id: Ibb3fb00bb1f1db2266203e3b3ba3cf36f69bb468
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions