diff options
| author | Bill Yi <byi@google.com> | 2019-06-01 21:58:00 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 21:58:00 -0700 |
| commit | 5e7ef56a33680984a916e9b3e29a318743b89888 (patch) | |
| tree | 232fc4321fbd54a7c841d7386c477c73274303c8 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | e01f17dc5f3fcf47cd15ecf89b23b7c9d4f02c10 (diff) | |
| parent | 57a1500698513593e7725f0dc346219f2839daba (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b3b93d72fb -s ours am: b5b893485e -s ours
am: 57a1500698 -s ours
am skip reason: subject contains skip directive
Change-Id: Idf56078cdbcdeed5f6bb35a8f4da18ddd0c7ac17
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions