diff options
author | Bill Yi <byi@google.com> | 2019-07-09 22:23:44 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-09 22:23:44 -0700 |
commit | 8c482c95e7beadbbc94b29e167fce919fb31a315 (patch) | |
tree | c4c609cc7f9aab145f26e46e4ba2fb5457e8ee0d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1f7de7023bd1f84faf2b615b565af0247e797287 (diff) | |
parent | a44fe677dc91ee26a1471014c4364f5f5b597dcd (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2f5007db0a -s ours
am: a44fe677dc -s ours
am skip reason: subject contains skip directive
Change-Id: I3b59d13a8876fa21f6ffd1316ca85871835e955d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions