diff options
| author | Bill Yi <byi@google.com> | 2019-07-18 15:25:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-18 15:25:48 -0700 |
| commit | 3e5062ccc52206b217d301775114be45baef9a6f (patch) | |
| tree | dd6bedb1cf97ea48888dcaee7bfdde0b2d851489 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4e684e1a9ce183dcf7d2fc4e50ffdfbe436915b3 (diff) | |
| parent | abb7a328aeb4f2b71d78075bedf0464f51cdeec2 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 465f347c2a -s ours am: dc8467d2b4 -s ours
am: abb7a328ae -s ours
am skip reason: subject contains skip directive
Change-Id: I2544cd004271afa1bad74e121fdabf44cf55983a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions