diff options
author | Bill Yi <byi@google.com> | 2018-08-04 07:41:46 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-04 07:41:46 -0700 |
commit | 339d2b173f471e556442058bb080b905e434eafa (patch) | |
tree | a70235945948deff0968ff1af50a810795685572 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 808fd4dbc49bbf1a2ed99c46446ac0ea72159bf0 (diff) | |
parent | 602a157812d52e63203b6e5b7b66df5c6a0a9022 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a66fdf51a9 -s ours
am: 602a157812 -s ours
Change-Id: I866dac5e3ccbc5dee840103690561eb4b63bc187
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions