diff options
author | Cody Kesting <ckesting@google.com> | 2021-01-29 23:22:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-29 23:22:47 +0000 |
commit | 46309401dbcc884752d7074d182fd463261be1a4 (patch) | |
tree | cc774be46b4570ab0a64c9d21114dd93d26c6232 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 22745a5c44ea7e1ef36bffc82d329b31d986c5d1 (diff) | |
parent | 89a75849c2a8b2c76dcb90b7a2fc806f5cb33d9b (diff) |
Merge "Allow system components to request underlying network policies." am: ba04ef8481 am: 89a75849c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533097
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf50bd8bba996b9bbbb4d77e1bac997fc95fbb10
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions