diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-12 17:16:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-12 17:16:57 +0000 |
| commit | cf1c61de46fd43841a16e6873285eb6820d360ca (patch) | |
| tree | cfa9e077e0b0148992e42173225e1c11ab906f23 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 79f36b5534f2314b3515b84beaaebdb675be7074 (diff) | |
| parent | 8447fd122e9eb84131a07caa569500229d095c57 (diff) | |
Merge changes from topic "am-df7bac20f576499eb8b154f337e435d2" into rvc-qpr-dev-plus-aosp
* changes:
Merge "DO NOT MERGE - Allow locking with feature or permission" into rvc-dev am: 7048655cbe am: 6f60371228 am: fe4534b304
DO NOT MERGE - Allow locking with feature or permission am: 9ead5a3c05 am: 1c71776f9b am: 5f60fd793e
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions