tree 47fb23787ec49230367f39ea47c9b2ccf456c9d7
parent 132b0dcbadc4179a914066b18bcf3fff5a1e546c
parent f2c389c4c5059eec015af569d12b2d40b70908ac
author James Mattis <jmattis@google.com> 1614798246 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614798246 +0000

Merge "Adding additional docs for OemNetworkPreferences" am: f13bcb0899 am: f2c389c4c5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a4cff353357a270f126a74d2648de755c64a6ee