diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-15 15:21:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-15 15:21:15 +0000 |
| commit | 9c27a4824b4364aa8adbd604da554bb85732a8d9 (patch) | |
| tree | 3646d7339dd34ea9acb334a7836c45f26a41e956 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 27df4716b1dbaf25065a6e030772924754a6fc55 (diff) | |
| parent | 93b429c0fb4253ab3ec06f7790074fb52afb0096 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ad8a5939c6 -s ours am: 4898d82773 -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