diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 23:40:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 23:40:42 +0000 |
commit | e4a2a5d059eaf4b0660123c3aa6068af16415770 (patch) | |
tree | 580bfe3bcf69fdcedefb9b609f1e6fec821bb557 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | be34c7019a2e8b031ed1abbee7308c888f53363a (diff) | |
parent | 2ddfce682ed1d4e551b6761c2ccaa21ddd1891e9 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 2ddfce682e -s ours
am skip reason: subject contains skip directive
Change-Id: I664e75c61dbf0df863c06bc2e2f81dfb4c88afba
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions