diff options
author | Bill Yi <byi@google.com> | 2019-09-25 15:26:47 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 15:26:47 -0700 |
commit | 1da3106efe52e8ab1a3b1733689e33cd4e48e063 (patch) | |
tree | c8914b42f690f9e2dd527d35b45345b4b37ff28f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6c52ea4e426fcad0c930d7189c3665041c253f44 (diff) | |
parent | 254132b362a64f28773741ff0e5a3f4ea55b6232 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: eadfdeb249 -s ours
am: 254132b362 -s ours
am skip reason: subject contains skip directive
Change-Id: I3f02cfda4f02125c10f18c921eacb9d2472d3f3c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions