tree f80a55ce3b7eee803b0be37ddfb383b074d6a4a5
parent 05d12ae6373dc245d2519f8974e79f1c221ad299
parent 98b7cc58c6569e8438dd55a55738b4958befb1c6
author James Mattis <jmattis@google.com> 1617988053 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617988053 +0000

Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: 98b7cc58c6

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

Change-Id: Ibc8b620025d5d61d34034f29e6f50d48f30b9b34