diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-22 18:50:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-22 18:50:34 +0000 |
| commit | a56d973a46eca10f9de31603ddd417daa9459768 (patch) | |
| tree | b3a675fda7d70e241b35897411b079fa59dcdf18 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 76aabd7b3f470c54133597174d692188d7d3128f (diff) | |
| parent | dfc420dda8af3a2d5a6bc43d70392815c9f6fac3 (diff) | |
Merge changes from topic "am-5b3500c6a7f543f9abf695f3343f61c0" into sc-dev
* changes:
[automerger skipped] Expose uids related APIs in NetworkRequest and NetworkCapabilities am: 02ed58ad24 -s ours
[automerger skipped] Replace the usage of UidRange am: f8c3e2eb4e -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions