diff options
author | Bill Yi <byi@google.com> | 2019-07-09 11:55:42 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-09 11:55:42 -0700 |
commit | fb1e7e7d6fec9f0d57ddc09340db8931a766441e (patch) | |
tree | 16f4e34d543707f3be9b9b27f5dbb75c0232434f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7344796b0a7129ea0df7da1c5905debc4fb1bc76 (diff) | |
parent | dc20f9aec4f504a4d35f35ab8c6f13de19628863 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: dc20f9aec4 -s ours
am skip reason: subject contains skip directive
Change-Id: I2d4e4be46226bcc1dd5e6087ae5b3714ad8c709e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions