diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-21 22:31:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-21 22:31:39 +0000 |
| commit | 04cd81fda72cfb8778c6dfc1c8276193ddd7fd85 (patch) | |
| tree | 1a9a61ee4dce54209a04b9ebdcd0ae0e09a74dbe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 40ba79442fef6c88380f215ceb402b5840084e69 (diff) | |
| parent | fa90167dcb838fc2e22c2f1827bb3486617a390d (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours am: af16a228a2 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions