diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-03-18 17:40:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-18 17:40:25 +0000 |
commit | c5cd0216654a00f55d208c3213c57694c88bcd99 (patch) | |
tree | 5071af90ad44eb54e267914357c5f403eb7712dd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f7fcee236eee5c6df3c94d1c2e0ce0dbb041d8c1 (diff) | |
parent | 65964e053e47726863ad516f311eaa10ec784d64 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65964e053e -s ours
am skip reason: subject contains skip directive
Change-Id: I3f7b89a2d7c8c6b0942969b64ca07cd5d8511c36
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions