| commit | 43d5f076708460abd84c524f10885c04f95a4937 | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Fri Apr 01 19:33:01 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 19:33:01 2022 +0000 |
| tree | ed1b50d60aef1e406451f2c619f91eb191473277 | |
| parent | 01a93ea1e4632b9b37e067416d4f5cf186997461 [diff] | |
| parent | 228f933f63c5ce2be4f8c9a55701a1bd8e0dfbcd [diff] |
[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>