diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-17 23:22:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-17 23:22:37 +0000 |
| commit | c844ea5c96bebd5ea3aa4cf13eb9ce68782b7513 (patch) | |
| tree | b6a94ec304ea77c9a170ece46d9d5687d0fc7152 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | a86ba9b6e53e5c11d4102463332d47479a98a978 (diff) | |
| parent | f3df46779d10dffe3875669495a7a1da61fb2f4c (diff) | |
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions