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