diff options
| author | Mark Chien <markchien@google.com> | 2020-05-30 14:46:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-30 14:46:40 +0000 |
| commit | 1ed6f017caa85d17da52c6108babcf15e8d8b5bb (patch) | |
| tree | 4a80b55e90310b7627cfff620f7a27da45a6293f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | cdb0f9e1b5aa946058f273f570c4e3b71b27dc90 (diff) | |
| parent | 495145fa63cb4a9337fecc43d7b65f164e830284 (diff) | |
[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 f53ec879f0 is in history
Change-Id: I99ca97c91bf2f3705b7295d14f5ddb84d29c84c0
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions