diff options
author | Bill Yi <byi@google.com> | 2019-07-31 15:10:58 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-31 15:10:58 -0700 |
commit | a312cc53903621532b91cecaa614ac555260499f (patch) | |
tree | 4876e7be4b9fbc6cc1085e41c01a3f58f6ef33c2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c3fcc26fb9bf4961cff003529a7280c1a6da6b2e (diff) | |
parent | 1f8702c05bf04a1ae144632d98ebd6e85063c7da (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: df181a429f -s ours
am: 1f8702c05b -s ours
am skip reason: subject contains skip directive
Change-Id: I4ae94c2c35391842b8952f30b02331ee838ca5e6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions