diff options
author | Daniel Bright <dbright@google.com> | 2021-02-24 21:52:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-24 21:52:51 +0000 |
commit | 1d191d325154b47841d50a600b94258b2e05774a (patch) | |
tree | 63bf45db5c6f01b3095a154aaa7dcc5f93dd1b42 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2b3fee42d8c05b2e1b484cd8991fcecf6b9cc6bd (diff) | |
parent | 1b9199883cd00dc2d7288bf432a9bee31632beaf (diff) |
Merge "Revert "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: 3e21e0ab47 am: 1b9199883c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606541
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0929431e4846eb0e9f830ec71cc32f70f885652
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions