diff options
author | Bill Yi <byi@google.com> | 2019-06-15 08:20:29 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-15 08:20:29 -0700 |
commit | 27df4716b1dbaf25065a6e030772924754a6fc55 (patch) | |
tree | 3646d7339dd34ea9acb334a7836c45f26a41e956 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7a24f888cbb06a017c942f2b136a3d547a7be55f (diff) | |
parent | bf00a7372eb4093644725706633dd3db7eec2b77 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ad8a5939c6 -s ours
am: bf00a7372e -s ours
am skip reason: subject contains skip directive
Change-Id: I92946352d33dde8674731be448b73d8b972abb9f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions