diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-22 08:25:53 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-22 08:25:53 +0000 |
commit | 61ad9b3a308e4bd675310eb0623129a966858633 (patch) | |
tree | 3111ac2d610fbc9d8644888cacb520a35c3cccc3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2744618843e11ce035aebad3c30253fac5a637dd (diff) | |
parent | a22e0ba1a9c460ae0b6498061455773a6be91eb7 (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 1328f9015a -s ours am: d5e671d32a -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions