[automerger skipped] Merge "Improve the net-capabilities scheme for backward compatibility" into sc-dev am: 89c463ba1c -s ours am: d16899e957 -s ours

am skip reason: Merged-In I56cde50d2adab81134c8be4f6996d68018f4212a with SHA-1 46c3c694d4 is already in history

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

Change-Id: Ia4c602f39ddaab1c1e8bbcfa7764df5776bd621c
This commit is contained in:
Frank Li
2021-06-18 04:10:08 +00:00
committed by Automerger Merge Worker

Diff Content Not Available