[automerger skipped] Merge "Add PROTOCOL_UNKOWN" am: e5e9a5c339 am: 235c3b6316 am: 228f933f63 -s ours

am skip reason: Merged-In I5bd0351925d27bb2178d4cd0cc93197f463236cd with SHA-1 7319c5f3fd is already in history

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

Change-Id: Ic44cd9f45c3f0a50f352e0ced964d6e478d0a8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sarah Chin 2022-04-01 19:33:01 +00:00 committed by Automerger Merge Worker
commit 43d5f07670

Diff Content Not Available