diff options
author | Bill Yi <byi@google.com> | 2019-05-21 17:10:35 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-21 17:10:35 -0700 |
commit | 20cf07b649dd8f385799d627a16e4ec529a36462 (patch) | |
tree | 9eb0af4e8a41101f9a8bae62166dc035215017cd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5d5aae95360325d71758a481c1ba0e473a0d3db7 (diff) | |
parent | b1aad16b4a2cf03fcc0ffb8100bb00e8ef189823 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: b1aad16b4a -s ours
am skip reason: subject contains skip directive
Change-Id: Id8279f685c9c7b01c79c0131ca724498775b9263
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions