diff options
| author | SongFerng Wang <songferngwang@google.com> | 2021-03-05 05:22:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 05:22:05 +0000 |
| commit | 037bb3218d827ab50bc7818cb2423290b2db5bfe (patch) | |
| tree | 9b9eb9ab519f4d97914f5ede6bda15e6ee60a841 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a615e5ecebbf8b090ca5965f96af2df2044e3ea6 (diff) | |
| parent | 03297aacc6658191c93dc3009951c0da0e79c076 (diff) | |
[automerger skipped] Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: b332627a15 am: 6035378f91 am: 03297aacc6 -s ours
am skip reason: Change-Id I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd with SHA-1 7d95185d46 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614985
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6ab9ba082546661985f097f2425a597618a60ebf
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions