diff options
author | Bill Yi <byi@google.com> | 2019-06-24 08:02:46 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 08:02:46 -0700 |
commit | 49a60e6b40c6f19b9556ff3fc165d6bc278c665c (patch) | |
tree | fec512f53c3ee99531e521a2d33aa0ea36f8b40b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 453efcb333fa7d3ad0aa994407d2075fd5e0847a (diff) | |
parent | cc13f9ed6659f4bc96c3f64f7284913160d9a5cc (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: cc13f9ed66 -s ours
am skip reason: subject contains skip directive
Change-Id: I67ecd75a9d2048417da9dd0fda82bcd650e2127e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions