diff options
author | Bill Yi <byi@google.com> | 2019-01-20 20:07:33 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-20 20:07:33 -0800 |
commit | 41b36b3fd9fa601cb685bd3becd2bb44803a3c9c (patch) | |
tree | 31633c5b901bfefe291f63b21cda2e307aa3f643 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 15b0f45c4962f1c76a0aa706c670e87f013d21e6 (diff) | |
parent | 64ca10b75bb7e8b8b9633b57f2a5fcaeb3c395b3 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 64ca10b75b -s ours
am skip reason: subject contains skip directive
Change-Id: I9cb42f21c58744655490cb81900a551fb4e20d77
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions