diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-19 11:31:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 11:31:48 +0000 |
commit | 0343bbff6e3ee5bb7c8b84faf9e1c9a5c137e89b (patch) | |
tree | 1c79023bbf7320a7fd20080daafd56c6b6a97297 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 38c581fc6cf953b8f18d7dad14539f55bc509d2f (diff) | |
parent | f04d15c33d611a3f567be2a0a76ffebcf9c3c6b5 (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: f04d15c33d -s ours
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 98dd271306 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646326
Change-Id: Ib90dc576f29662385479a9f7bbb16cdca13ef826
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions