diff options
author | Bill Yi <byi@google.com> | 2019-05-25 14:13:14 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-25 14:13:14 -0700 |
commit | a3fe8e92c99192a125e5e390434150e60c564a35 (patch) | |
tree | daf10c6cf525b1586ea8042b9269d30b5d7fb23d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | eed4df2cfd936df88127d9af1ffc0b120b28cf37 (diff) | |
parent | d1f76e99cddde5f1f0ae619c836ee6620c7d4947 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 85dcca9b69 -s ours
am: d1f76e99cd -s ours
am skip reason: subject contains skip directive
Change-Id: I4b94979e3e919d79b5bb4ca2e901476ce25306fb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions