diff options
author | Bill Yi <byi@google.com> | 2019-08-11 21:41:42 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-11 21:41:42 -0700 |
commit | 70ed26b986ac00a65b5ddd9ef92bfdd4b2e4516f (patch) | |
tree | 2b904d8e4440548c05da0123a8b2784b905f2750 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | bb3c59e7768acf4c32293ff0727c7e011f3c5c41 (diff) | |
parent | a6e734563692b562da83da0afb7b3775e427c902 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours
am: a6e7345636 -s ours
am skip reason: subject contains skip directive
Change-Id: Iccd8a20d4268b2de81f006ed55daaa2c4d64237f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions