[automerger skipped] Merge "NetworkCapabilities: Embed location senstive TransportInfo" am: d3ee5559ed am: 8244f5ea81 am: 0ffd0b025a -s ours

Browse Source

am skip reason: Change-Id Ie522d8c75a82ae521ccfd5165823d0c72642e651 with SHA-1 e9261ea9d6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7ace3cc9124b36ddc62306373442d724c3682d8

...

This commit is contained in:

Roshan Pius

2021-01-15 13:57:26 +00:00

committed by Automerger Merge Worker

parent ed05db93fa 0ffd0b025a

commit 3f664d9a9d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available