diff options
author | Bill Yi <byi@google.com> | 2019-06-24 08:03:12 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 08:03:12 -0700 |
commit | a9cd5d94f3e16bc370cda69a10266f30b8ef11cc (patch) | |
tree | fec512f53c3ee99531e521a2d33aa0ea36f8b40b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 49a60e6b40c6f19b9556ff3fc165d6bc278c665c (diff) | |
parent | 4ffaa9a2254069fa7ca289e1f684b98b58944433 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 4ffaa9a225 -s ours
am skip reason: subject contains skip directive
Change-Id: Id9c11f98769577ae9485a2fe4a7a726c7d6ca9e4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions