diff options
author | Bill Yi <byi@google.com> | 2019-07-05 08:29:59 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-05 08:29:59 -0700 |
commit | a3f6f8b46f9bfb0129430967fe9f7dbcfeef1c52 (patch) | |
tree | e017b5d1f1720fc073e7c67f7f09c10e33f1b2d2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ee9e037184737561fe308ce3d35f3970356f846d (diff) | |
parent | 63f2e002bb59c24d5cb8ac779e10426197c7bd38 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 63f2e002bb -s ours
am skip reason: subject contains skip directive
Change-Id: I039ced0f89236a52da2b6b887d142347c725fd6b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions