diff options
author | Bill Yi <byi@google.com> | 2019-06-25 11:27:05 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 11:27:05 -0700 |
commit | 92867cfa233b4d5d026298dd666a8c469aa603c1 (patch) | |
tree | e1e3da6315fb453c62e1dbf3a6fe2896b0443344 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6a43c89dbb8ff014b39c05579ce5ca1d70674f02 (diff) | |
parent | b2f786854741d3c9703416a2cea7c3f3c36b11d0 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: b2f7868547 -s ours
am skip reason: subject contains skip directive
Change-Id: I0ae2042902fdbc86d41add0767f86db476b514c4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions