diff options
author | Bill Yi <byi@google.com> | 2019-07-03 20:04:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-03 20:04:45 -0700 |
commit | f3de9c5e8b05b5b64cbe6d02b40acc4bd22abfee (patch) | |
tree | 3abe94a751dad82ec9255cb2a66d0d19900a87cb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 9bd5d8b43def8c0bbf827d0dd34a085d938a38bf (diff) | |
parent | ba533cba21deeb017ef822a504a18a7fdf54416e (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: f6313c9dc7 -s ours am: 549900c29a -s ours
am: ba533cba21 -s ours
am skip reason: subject contains skip directive
Change-Id: I1a6979ec24c41963eff95740df8b5f5b8d1676f7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions