diff options
| author | Roshan Pius <rpius@google.com> | 2020-01-16 13:05:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-16 13:05:13 +0000 |
| commit | feb86eae2eee20a8bb54ac12324741d367073ca1 (patch) | |
| tree | 8037853700b08ad46f37d7f6b619d31404b8904f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13c4957cb4e483edccd603d6c677ec169124db21 (diff) | |
| parent | 38b3e3a1045be40253ce04d13e10ba35f07d89d0 (diff) | |
Merge changes from topics "user_remove_extra_user", "wifi_net_utils"
* changes:
UserManagerService: Add UserHandle extra to user added/removed broadcast
wifi-service: Jar-Jar net util library
WifiManager: Add API to query STA + AP concurrency
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions