diff options
author | Bill Yi <byi@google.com> | 2018-08-04 07:52:27 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-04 07:52:27 -0700 |
commit | d86544ae184ac6ae5b1dcbd35ba085cce064d50c (patch) | |
tree | 1fd6d7d0bd41b2cb0d90d6c63626a6bcfb07e7d5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6791b9c62e873d2f1e26b9da66ef48a51968a080 (diff) | |
parent | df00e2141fb21f67029f4953c3eee8703fdf9941 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: df00e2141f -s ours
Change-Id: I2298519e9de20f860881621ca23ddd59b10f543d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions