diff options
author | Bill Yi <byi@google.com> | 2019-07-03 17:13:30 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-03 17:13:30 -0700 |
commit | a55efd89e11e44cdc016db6cb8abb2c6a0eecb34 (patch) | |
tree | 2097685ea36cc7d9093c50f0d18229dd32bc9517 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6e7bb1e7cf7fb96ce5760f9e1628fb3cb247ba7e (diff) | |
parent | 52dd2328b871eda47ab2c088e0763b57dc4adc19 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 52dd2328b8 -s ours
am skip reason: subject contains skip directive
Change-Id: I1cf87422b102aa48794a26cc224abe23618a87c6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions