diff options
author | Pavel Grafov <pgrafov@google.com> | 2021-03-06 12:12:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-06 12:12:14 +0000 |
commit | af9181a67d363af5dc80ca7d660951fe31241ff2 (patch) | |
tree | 375f9097a3b855aea25484eb590d05c0bad5333d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 93997dd20ca30bd89ca4e9ab48eaacfe759b2479 (diff) | |
parent | 685bbb18fe777df86eeead51bfe30527b0850406 (diff) |
Merge changes from topics "wifi-dpm-grant", "wifi-keychain" into sc-dev
* changes:
Allow WiFi module to request grants from KeyChain
DPM API to grant keys to Wifi
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions