diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-25 18:48:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-25 18:48:29 +0000 |
| commit | bcf3392856b353f2b57569f2e0b0ebf5428b6db0 (patch) | |
| tree | a2807258d6635b50fad8ffc458516f8892080657 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | f310c792d46f96c0658c93fb21f6688eb1e4cac8 (diff) | |
| parent | d7b199be9a5489ffb346b179b8d4c27d05d15279 (diff) | |
Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707
[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions