diff options
author | Bill Yi <byi@google.com> | 2019-11-09 16:08:36 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-09 16:08:36 -0800 |
commit | 43ee27f969c59063204634ad5f323e3d0d9c2947 (patch) | |
tree | 5034a5921cfa33b9312722e06eae302e21d0cf8f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4cbdb405481d3ef0f89dc910dd3d8d2326b55ff0 (diff) | |
parent | aa0ebd7da944483e129f665bec4b2e98e1425440 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: aa0ebd7da9 -s ours
am skip reason: subject contains skip directive
Change-Id: I20abdd0866faa94de019f2fe530fe833114796e6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions