commit | 09f21a03a2c2aa6b3762adf268be0f7c54a530e3 | [log] [tgz] |
---|---|---|
author | Patrick Rohr <prohr@google.com> | Thu Dec 03 11:51:32 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 03 11:51:32 2020 +0000 |
tree | f2db53535a4a456b1f6422c74d1044c76f868d8d | |
parent | d64997a880d3d30e2b7169587b1e5712356ad361 [diff] | |
parent | 3148f011e05e3e12dc123a8582ccc4292c118213 [diff] |
Merge changes from topic "restricted-networking-mode" am: 176ba02184 am: 3148f011e0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505234 Change-Id: I1ae2656e91f1fa6b35ea34177496bd9ad23daceb