diff options
| author | Bill Yi <byi@google.com> | 2019-07-11 15:22:28 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-11 15:22:28 -0700 |
| commit | 37a91339ea326e7370ada15c38c05146eb4e91a5 (patch) | |
| tree | ae45a2ae9338867b05cd78f02d350dd74b6cc7bf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 72365384fdc99aa65375f97f927671fc7768a699 (diff) | |
| parent | 0d2a5f94ba2e41e09759012019b9fa3a79877c9e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0d2a5f94ba -s ours
am skip reason: subject contains skip directive
Change-Id: I03c4084ad3037ea333ded87c6bfcd3090e605562
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions