diff options
| author | Roshan Pius <rpius@google.com> | 2020-09-30 14:17:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-30 14:17:37 +0000 |
| commit | d025d3b472c59185e686cc342a7d72808b6a9773 (patch) | |
| tree | 2fc21ce49ee226323caa79a158665e480c6d57d2 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9920baf44004fdd976fcc4c71184eb560c9acd1e (diff) | |
| parent | 102e083d6957f64c3a5372dbe68ceb0786ac3bc5 (diff) | |
Merge changes from topics "oem_paid_suggestions", "sta_sta_feature"
* changes:
WifiNetworkSuggestion: Add setOemPaid flag
WifiManager: Add public API for STA + STA concurrency support
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions