diff options
| author | SongFerng Wang <songferngwang@google.com> | 2021-03-09 13:51:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-09 13:51:23 +0000 |
| commit | 1971fbc7475352fc72b5521a8ac993e588430057 (patch) | |
| tree | e0795ad5223f2864e6746fb80cf91fe2fd711cf3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9080ab7c85f2ab19be6cb5070587f3a8924c03df (diff) | |
| parent | 4c8d91f2c8e7bf407ad395bcae2adc8c5affd7ec (diff) | |
[automerger skipped] Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: dfbd3a4072 am: 4bf02f2282 am: 4c8d91f2c8 -s ours
am skip reason: Change-Id I48d36d73d016f7aa7fabec25a725abe03b1dee8d with SHA-1 ed6078c020 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614991
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie53d918cf8bf1ee51f8397a060d6a24a97511b57
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions