diff options
author | Bill Yi <byi@google.com> | 2019-09-25 16:34:08 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 16:34:08 -0700 |
commit | 5acffe3a24fdd10ac0d2c8c52397cc89ed724133 (patch) | |
tree | c8e287e790ee4fae08838d85841efc27321250f7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6ad9a215fa776a4fad688a01f7926966be0dd481 (diff) | |
parent | 72b6302caca4352cdbd44a3d67b8c9e5bc28b9a5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3371f4323e -s ours am: 999db9b2fd -s ours
am: 72b6302cac -s ours
am skip reason: subject contains skip directive
Change-Id: I3f167e1ee1db3c55da5f6650e8a82074d841dcb1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions