diff options
| author | Xin Li <delphij@google.com> | 2019-08-15 17:47:08 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-15 17:47:08 -0700 |
| commit | e236f78fc8033f07f3218e6c989f8227c4fb31a2 (patch) | |
| tree | 8b60ed941f57d973498906e0a7c5271090be5bc8 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 0e80b14588894c33a916194ff0d2d67e875d0ff1 (diff) | |
| parent | c64852517ae695b7115f110e2e507965418c1fcb (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master
am: c64852517a -s ours
am skip reason: subject contains skip directive
Change-Id: I8cfc0d65ebe07ca52903e6f7a3570408394e5ad4
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions