diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-19 11:07:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 11:07:23 +0000 |
commit | f04d15c33d611a3f567be2a0a76ffebcf9c3c6b5 (patch) | |
tree | b0d93d5728ecc584dea8b6943bf693e0abf6ef4a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | aab9659d41ff095a52e643522890205cf130f264 (diff) | |
parent | 10f14e41be559261c27b056234efc736f88cefd9 (diff) |
[automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: 66794f915f -s ours am: 10f14e41be -s ours
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 7dc302d612 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646326
Change-Id: Iffa4b2d7c7a9d03a70a6a01a545bb91e88bfebb1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions