diff options
| author | Bill Yi <byi@google.com> | 2019-09-25 16:08:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 16:08:53 -0700 |
| commit | 94a3f227ab6adfe34cd1a189dad1c76a231ef0d0 (patch) | |
| tree | a8e0c84c716c0ebad45aaf6e51a28cf285457b49 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c75cf1f0c7131b797a7a8acabd07d53dc556d05d (diff) | |
| parent | 27f72a29c7bd2ea5a1d7904b2d805769eaa13b9b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cd1ef6fddd -s ours
am: 27f72a29c7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifdb12beca52d86abf771c16c5f317f9d5e8e161c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions