Junyu Lai 8d06e8aba8 Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 00caf89795 am: 227fc5d23d am: f76c711734 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549897

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide501fcf659637c0ec175d3f6f5926c2482734e0

2021-01-28 14:58:38 +00:00

..

java/android/net

Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 00caf89795 am: 227fc5d23d am: f76c711734

2021-01-28 14:58:38 +00:00

jni

Update jni to get int descriptor in native layer

2021-01-27 02:44:14 +00:00