diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-22 13:30:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-22 13:30:09 +0000 |
| commit | 7d9c5a34a57760436ad7b8cd8ab9d34132379924 (patch) | |
| tree | 7955999d0c01bcf7631978ce1062cb901680c22a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bc36dc92d5ae27ccf2b9347bc4e655c311cbfb3e (diff) | |
| parent | bfb6a05d6ffaeddbdddb9928c8c8717be0941fad (diff) | |
Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 033d7caf95 -s ours am: 091970a592 -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