diff options
author | Bill Yi <byi@google.com> | 2018-08-04 08:35:30 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-04 08:35:30 -0700 |
commit | c825670b29746d78bbf9c7d313582a9f774166fd (patch) | |
tree | 6d94f7072a097a8ed700480ede4be7fa8608e5a4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0ad98dc6e1ddbdcae350bd5611d76d65fedeeab3 (diff) | |
parent | 96afaf50a982f73d17cc40895bbf936f7f28ef20 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2ea36ff2ef -s ours am: 11e027de9d -s ours
am: 96afaf50a9 -s ours
Change-Id: Ic82933e22f35419cb2c102b2de4dfa3aa750a892
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions