diff options
author | Bill Yi <byi@google.com> | 2019-06-30 17:34:29 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-30 17:34:29 -0700 |
commit | dcf20b7c278e9dee2542a7eb34645d2afb9b5988 (patch) | |
tree | 318c0846ecbc3f544c9a54409bbe738d53e99afc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e876855f599c8fc11a9f1371e3ae1c01d32d794a (diff) | |
parent | 5924e5eee9b9f011a830583bba094df810a18d5b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 5924e5eee9 -s ours
am skip reason: subject contains skip directive
Change-Id: I7f6543dd6609066815ed0a252adf34e37e0ca511
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions