diff options
| author | Sarah Chin <sarahchin@google.com> | 2021-02-05 06:16:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 06:16:01 +0000 |
| commit | 1a99c16d7c95c07af2fd52084af5bb4c1d0af537 (patch) | |
| tree | e129c75c391adb49eb42cd05dfc301e5a5c0f1d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9d82a647f06bc9ac65d61c73b3e59c2334bf9f87 (diff) | |
| parent | 3cde1b28c9ee377fd443e20499f169a46f0c9619 (diff) | |
[automerger skipped] Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed49 am: 3cde1b28c9 -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: I19d551d9f9c517f553af103b54ce615b6502521e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions