diff options
| author | Bill Yi <byi@google.com> | 2019-08-06 03:15:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-06 03:15:06 -0700 |
| commit | 0eaa620dba6b0dc46c8914800f86f717dbb18e7f (patch) | |
| tree | caeb38a00810c0dc58a30b33e338e11ffe044dea /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7d1422cafa24dbd1930fe3a63cff724c5d8ed09b (diff) | |
| parent | d6947882d769478e1e2dfec4230938c3dbcc6283 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 83b7531e1b -s ours am: 5621f5b11c -s ours
am: d6947882d7 -s ours
am skip reason: subject contains skip directive
Change-Id: I41950cdd20fd10c8ca9ac7e89b9d6246f2be2e02
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions