diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-28 05:58:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-28 05:58:48 +0000 |
| commit | 8164bd1c67977a7db126f5ec0f93b9dc4da98bf1 (patch) | |
| tree | c8d54f725478b0e9b13385242e8ab61196e2a050 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 092b8ebc284046b93bc02d644c4e77434ecd1aa3 (diff) | |
| parent | be5668fbc23922ff92a1517d3ee9bfcfdf96d2d0 (diff) | |
Merge changes from topic "am-d829724f7889490d818e6069212702eb" into qt-r1-dev-plus-aosp
* changes:
Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev am: 0edeaa365e am: 431664822c
[automerger skipped] Add Rfc6724 style sort for DnsResolver and fix potential bug am: 7466ac8dc2 -s ours am: 20c6f40ff8 -s ours am skip reason: change_id I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4 with SHA1 d352f4ca85 is in history
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions