diff options
author | Bill Yi <byi@google.com> | 2019-02-19 20:40:18 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-19 20:40:18 -0800 |
commit | 34a72c2078f935acf6c3e9bfc9a0901e73fd93b5 (patch) | |
tree | 2b005208b98c4bd6724e4382d022752830115e1c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f100955183ebcbaa6f798c17ae138c85411814a4 (diff) | |
parent | 4f522f602aa714ad6363da3114c03c89a77d1b94 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 85c48edc69 -s ours
am: 4f522f602a -s ours
am skip reason: subject contains skip directive
Change-Id: I73d825f8d67573b315f4d0081f402552f387a2b2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions