| commit | 8a94251a10027931b74a9b932c4444794bb8eb73 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed Jun 09 10:48:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 09 10:48:06 2021 +0000 |
| tree | 7a3bd73e90b88b642fc021ca6e92c515041193d0 | |
| parent | 45be14121e2a0a980478368eb6bf158c9f2d8433 [diff] | |
| parent | c9808887271c4c05261caec616fe343e4a3b6ba9 [diff] |
[automerger skipped] Merge "Add NET_CAPABILITY_ENTERPRISE into FORCE_RESTRICTED_CAPABILITIES" am: 428d213add am: 26af8a38b5 -s ours am skip reason: Merged-In Ice1d0b87ed40bd5991217fe9d7b0c919a82d8acc with SHA-1 620d14c43f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1730119 Change-Id: Ia23beee0255a0af00d02cdc1c768ae0ef7ee3c96