diff options
| author | Bill Yi <byi@google.com> | 2019-07-09 22:48:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-09 22:48:51 -0700 |
| commit | 6d4ec5e675e9b33fe7cc7a744943bc7763a2c8e0 (patch) | |
| tree | c1258ec211e5f02759a8b2bff762a4db9bc3eff3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 72d61607a27ad2e72cc2d0ba81b2fa3b509fc64b (diff) | |
| parent | 506d74247aadd92db2785ad12a977838b8db0536 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2f5007db0a -s ours am: 7fd9a81f83 -s ours
am: 506d74247a -s ours
am skip reason: subject contains skip directive
Change-Id: I7c9d7f471ea5f8992dd1a7810b5390d3bfaf7b14
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions