diff options
| author | Sarah Chin <sarahchin@google.com> | 2021-02-05 07:03:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 07:03:56 +0000 |
| commit | baab776860c312dddc5607834b84170a28171d4e (patch) | |
| tree | 62fa245813ad186a2ee4baea04d5ff1d98dcc270 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 4c1c5346046dfe46aca7695453b796af9965f3fa (diff) | |
| parent | 1a99c16d7c95c07af2fd52084af5bb4c1d0af537 (diff) | |
[automerger skipped] Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed49 am: 3cde1b28c9 -s ours am: 1a99c16d7c -s ours
am skip reason: Change-Id Ie196db5e236e478f1c29c3dfd1ca31acc205c54b with SHA-1 9762f014fa is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569340
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifc704a20cdb84c696ec22033f57a331195234e1e
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions