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