tree c567864579d214b435f4daec56eb074f393fc0b9
parent cd42593479afb4e4ca815c09850babef9fef4b88
parent 235c3b6316ebe669a68b90472761ad8a270a9ae7
author Sarah Chin <sarahchin@google.com> 1648840402 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648840402 +0000

Merge "Add PROTOCOL_UNKOWN" am: e5e9a5c339 am: 235c3b6316

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

Change-Id: Ie17d28198fe3b0dd2edf88986550e3cd183f7986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>