diff options
| author | 2022-04-26 16:14:29 +0000 | |
|---|---|---|
| committer | 2022-04-26 16:14:29 +0000 | |
| commit | 8dbbb3ef6c07b865c30170298da848f288760b27 (patch) | |
| tree | 563b861f38b02725c3569f149330978ccaa372e2 /libs/androidfw/StringPool.cpp | |
| parent | c3fa65f23ae80575e56983d74fd3aa812219e38b (diff) | |
| parent | 0df05f5e935f490a9eff5486b5735d13848f7a28 (diff) | |
Merge "Revert "Allow device owner to configure preferential network service"" into tm-dev am: b1e2060975 am: 0df05f5e93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944525
Change-Id: I12cfdc60e9c669d7bab6a85ce1b80bb84901546d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions