diff options
author | Bill Yi <byi@google.com> | 2019-06-19 20:49:07 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 20:49:07 -0700 |
commit | 193b34eab269e7a37ee25602656470bdf741860f (patch) | |
tree | c8819fd292ca3f285bf3ac70a9b7525024c1b495 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 23dd8842d326b32582410ef772849b292b8a233d (diff) | |
parent | 0a910f326c553cd1bb0725ec2b3179f16dfc7ab4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e7bb3a5117 -s ours
am: 0a910f326c -s ours
am skip reason: subject contains skip directive
Change-Id: I09c3121ff6b66102252ed11f5198d3282820a009
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions