diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-22 12:33:32 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-22 12:33:32 +0000 |
commit | ea2e73115ce70fc328844b2f15b11cdc135c691d (patch) | |
tree | 14ce77591432911b53f5f6a93ac2ff0eceb31be9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6e936043cf8db9bfbf2699ac43bcd71daaf019ba (diff) | |
parent | 5c2e5224b022ccf6df8a677230d8c45d93e83d91 (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 033d7caf95 -s ours am: e19836acd5 -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