diff options
author | Bill Yi <byi@google.com> | 2019-06-05 01:10:27 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 01:10:27 -0700 |
commit | 5c18f503a6361a9827169db50d380e10088aca37 (patch) | |
tree | abac94c409138229fba8d67af07501c4473cff84 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e634446bebe0e1f4bb0d53adf20ddbd850e4a9f6 (diff) | |
parent | d10a92f20c1298b3a67d714910cf9356e3bb7b81 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d10a92f20c -s ours
am skip reason: subject contains skip directive
Change-Id: I761eb5f8a956555ef6341f001b6ba952a1c888e8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions