diff options
author | Bill Yi <byi@google.com> | 2019-07-14 15:37:25 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-14 15:37:25 -0700 |
commit | d52909669bd3c39472905a5ee5a93006c6ce11fa (patch) | |
tree | 784b697094684c896cc3bd7fac6be298f5425444 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 113501a7105ea2ef1e39bbdbe4fcb6758dc8fe4b (diff) | |
parent | 0e416d6a48d435d81291abcc1a884609d013c257 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2d016d1b44 -s ours
am: 0e416d6a48 -s ours
am skip reason: subject contains skip directive
Change-Id: I406f29ba213ac4dd9aa596a15a3ce8476706873f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions