diff options
author | Bill Yi <byi@google.com> | 2019-06-19 12:24:47 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 12:24:47 -0700 |
commit | eb78772f6f040b7d064c5191592ad1022b40e76c (patch) | |
tree | cab59a4a253ed39d1bc24e49536a184eb5afcc9f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7bef0545cd0a47bdf5b78c12a18a78f5cd311c78 (diff) | |
parent | d9b1a5a38763db10f7b83f6eca919ef84199923f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: d9b1a5a387 -s ours
am skip reason: subject contains skip directive
Change-Id: I8b996446855026b86f1d3aa6d877572df354b42b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions