diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-25 18:40:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-25 18:40:29 +0000 |
| commit | 41ae4b7eae7e1844e70c282eed02471f8d83fb9d (patch) | |
| tree | a2807258d6635b50fad8ffc458516f8892080657 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 19f08130b11ab6fb79bd98265a928c0ab1c6696a (diff) | |
| parent | 77243e2d28d4d6f961c6b7c9f86accd22243bc1f (diff) | |
Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions