diff options
| author | Paul Hu <paulhu@google.com> | 2020-11-18 10:47:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-18 10:47:10 +0000 |
| commit | 6bdfcf5a4b3c95a03d16be65756db94615ec5485 (patch) | |
| tree | 7598bfc2768247aecd1170abbd2a3f9f68fd19cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a829f0ce88b84ec2dfbb3845063ca1f23993e4f (diff) | |
| parent | 3f3766a881c3c59d192dade4b6e5302d25e3359b (diff) | |
[automerger skipped] Merge "Expose BroadcastOptions#setMaxManifestReceiverApiLevel as system API" am: c5ec644861 am: cb9a7b819c am: b12dfe489f am: 3f3766a881 -s ours
am skip reason: skipped by user paulhu
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466224
Change-Id: I887750c967153ee9f390960d74685ea7efb79d73
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions