diff options
author | Bill Yi <byi@google.com> | 2019-07-18 15:29:03 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-18 15:29:03 -0700 |
commit | 95601625fce4f6eed462e3be460b7c4d831bc482 (patch) | |
tree | dd6bedb1cf97ea48888dcaee7bfdde0b2d851489 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3e5062ccc52206b217d301775114be45baef9a6f (diff) | |
parent | 78f815aeb25a27935829e9064a5868e92884dc62 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: daeb1bb863 -s ours am: adf3b1bbf7 -s ours
am: 78f815aeb2 -s ours
am skip reason: subject contains skip directive
Change-Id: I1a302d7055034a554eeb5bdd0689c8fcc47ca28e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions