diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2019-05-15 16:05:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 16:05:43 -0700 |
| commit | dab9561dcfe28175c1956366d8823d0dee071217 (patch) | |
| tree | 06a7236c87ffd490ddb13cbcecf1ad5aa7d110b5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dec4de087e32b716b0dd6a25642f934bcd70e7c6 (diff) | |
| parent | 72cfd0af95e091f5faa90ea71ea86a6e7444d80e (diff) | |
[automerger skipped] Merge "Fix a bug where private DNS to v4-only servers don't validate." into qt-dev am: 036871beb8 -s ours
am: 72cfd0af95 -s ours
am skip reason: change_id I362d43ee6af318694a4038a257e1ebb3f577863c with SHA1 4b5f3a313c is in history
Change-Id: Ibd55bb979a6fb996bfd922ff1fd66a6fd259db58
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions