diff options
| author | Luke Huang <huangluke@google.com> | 2019-04-16 23:49:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-16 23:49:33 -0700 |
| commit | 82d3d758bfbc31b396074964f6d1fdcbbf3c0dde (patch) | |
| tree | a496dcfbea6fb4873d77dce1e8bdaf0214c6a56f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 31b9de7867c3c6ed04078e8ca7bdbd7b9a686253 (diff) | |
| parent | f20e67cc17e4772ded948f4e8ac1693c44b95b62 (diff) | |
[automerger skipped] Merge "Fix DnsResolver API could not bypass private DNS correctly" into qt-dev am: b45d24e35a
am: f20e67cc17 -s ours
am skip reason: change_id Ic9e078f8acf7688850dfe31f15ed065739ad5281 with SHA1 c21eb1fb31 is in history
Change-Id: Id5542048791df174c17b5c74651dddc5ee304b7f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions