diff options
author | Bill Yi <byi@google.com> | 2019-07-18 17:16:11 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-18 17:16:11 -0700 |
commit | 713a6a9f2c9146dfd9a68c62b46c2a7623cdc931 (patch) | |
tree | a0b08b2facc5bdd780b287afa039bd314c492d8a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | b373daebd247f1283161edd1c6f4ffefab5aadf5 (diff) | |
parent | 02f1653b81deb36463b7f55c98fa12c9d4eadf6c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: d0ace76ff9 -s ours
am: 02f1653b81 -s ours
am skip reason: subject contains skip directive
Change-Id: I7b6095b13e37a880b891c8c6d05bc5703ebdbc3d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions