diff options
author | Bill Yi <byi@google.com> | 2019-08-09 10:22:56 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-09 10:22:56 -0700 |
commit | 2573e061e68ef37168eebb29a3d7a6a0568d6987 (patch) | |
tree | 5ad361e59bf364639f6f00ebb5754b9f4dd92879 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fb39d93d3c27267d5c4f1b104de30fbca0a5fa7c (diff) | |
parent | b3c1bb04b8ecdc9fa27561b73c3282690604897a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c7a7eaa776 -s ours
am: b3c1bb04b8 -s ours
am skip reason: subject contains skip directive
Change-Id: I31eaf1a8e95678a3f92de071e6767db67c29bc72
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions