diff options
author | Bill Yi <byi@google.com> | 2019-08-11 21:51:38 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-11 21:51:38 -0700 |
commit | 000a882ba340bd560a78de35587287cb36a2aa2b (patch) | |
tree | 2b904d8e4440548c05da0123a8b2784b905f2750 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 70ed26b986ac00a65b5ddd9ef92bfdd4b2e4516f (diff) | |
parent | eb16f029eea8bad01cbbadf01c20bde75e30b91c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours
am: eb16f029ee -s ours
am skip reason: subject contains skip directive
Change-Id: I6a695b9f3f33b26f480d94195bafc08cf823f6c0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions