diff options
| author | Bill Yi <byi@google.com> | 2019-07-31 15:39:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-31 15:39:17 -0700 |
| commit | e1e2df5d9615dc251668235b708424c9ceaa8645 (patch) | |
| tree | ee58279259af495f6b59f3adce33e8429d152565 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b24cf8061c51c9e44941c799b61fc6a01dcb439c (diff) | |
| parent | 15ced1102b38646fb4a9a00abd4ea75465e2f30f (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: de521e7d3d -s ours
am: 15ced1102b -s ours
am skip reason: subject contains skip directive
Change-Id: I27421cdc1bf9960274e45c72570b7940d43a2a04
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions