tree 47fb23787ec49230367f39ea47c9b2ccf456c9d7
parent 04707731d326838b8cd0d230099d567190a96978
parent f13bcb08997b561fba8be2e013b3157cd672a524
author James Mattis <jmattis@google.com> 1614795873 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614795873 +0000

Merge "Adding additional docs for OemNetworkPreferences" am: f13bcb0899

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I947176ec2f71fcddb7bc432b23917eef219562f3