diff options
| author | Xiao Ma <xiaom@google.com> | 2019-04-23 02:42:37 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-23 02:42:37 -0700 |
| commit | aeda82b65d935a2973955cab2b08dbfd5d16af41 (patch) | |
| tree | 5794fcf6d86b66f70c416e1c0ac4c8cd919e023a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1cdc8f4ce78c8637f18c26193e758b5ccf9e98f8 (diff) | |
| parent | 9f7760dd21278cefd945c0cf8a416149ed24ebb9 (diff) | |
[automerger skipped] Merge "provide a resource overlay to configure customized DNS Server." into qt-dev am: 27ad19ee9e -s ours
am: 9f7760dd21 -s ours
am skip reason: change_id I123b3d4516cc6ba6d17629eb74daf448ba7121eb with SHA1 a4d0122048 is in history
Change-Id: I37d42112fbe79882265e44c55cc16ad44797ad4e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions