diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 13:08:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-19 13:08:35 +0000 |
| commit | 69d845519a73fb7d6fdc81016ab2a2e104a415d5 (patch) | |
| tree | 2c1f1ac7e044779a55c7494029908bcc03e68725 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 7b674d05172e00c9bbf04989af11c2f8f5464617 (diff) | |
| parent | 5decec715d9fd1307527ee4fabd5f16e06f0bfd5 (diff) | |
Merge changes from topic "am-68be966eb69c42be9da64afcf97a48dc" into sc-dev
* changes:
[automerger skipped] Merge changes I18d2ccea,I4e80a75d,Ib8ea2a17,Iaba678ed am: 79d2054b14 am: 4247c39cd5 am: f62fcf6e41 -s ours
[automerger skipped] Remove reference of NetworkAgent#unwanted() am: 705370a231 am: 95d55e71af am: c7fafa186b -s ours
[automerger skipped] Remove references of NetworkAgentConfig constructor am: a1a61cde9c am: ddc41d43c7 am: d4a41a8a38 -s ours
[automerger skipped] Remove reference of @ValidationStatus annotation am: 557797e32c am: 1dd354e2d7 am: cedeb55983 -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions