diff options
| author | Xin Li <delphij@google.com> | 2019-07-02 12:40:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 12:40:14 -0700 |
| commit | 9829d71c1032669df7bd43a5af48c1919fa9de19 (patch) | |
| tree | f7a6131b800de7eb5f237d5e96b8ec16e904d355 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 45e4f2e836351735925d74563d12b1ced95a41e5 (diff) | |
| parent | ca4c520f19d930ad2f2d1b2b2638aa4b7e135948 (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master
am: ca4c520f19 -s ours
am skip reason: subject contains skip directive
Change-Id: I1a32cee69d0edcb92d81a4bb8e6f98912d86a735
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions