diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 19:59:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 19:59:35 +0000 |
| commit | e486d799851c3caa97185197eb569a6201185f69 (patch) | |
| tree | dac19bcd950eb9f604aa457dda59ab83a214df15 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | eda04f3ddc2c9a2f9411a4ba0ad7a1dd7970f74a (diff) | |
| parent | 1a895a88d90f04ec6b42236f6ec37569be5ac193 (diff) | |
Merge changes from topic "am-04870cc916db40ebb0847ad27beb28fa" into rvc-d1-dev-plus-aosp
* changes:
Merge "DO NOT MERGE Fix work profile change race condition in LMS" into rvc-dev am: 48e0bab2f0 am: 40ca739264
DO NOT MERGE Fix work profile change race condition in LMS am: 9b0b32bd17 am: 2b5034513b
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions