Merge changes from topic "am-09e820e1aa2f4beb8e378aad8d0dd0cf"

Browse Source

* changes:
  [automerger skipped] Merge changes I46fb8cfe,I4181b465,I99e1ca1d,I66b09693 am: aa6698b0b4 am: 16aa1bcc9f am: 4f3dc5372a -s ours am: 3c1bcfa499 -s ours am: 66e37f6734 -s ours am: 5c02533491 -s ours
  [automerger skipped] Don't remove devices on onHotplug() am: c188a56888 am: d27da8101b am: 4b324cc630 -s ours am: 0381f99fa4 -s ours am: 4215661e84 -s ours am: 9cbc884577 -s ours
  [automerger skipped] Assign local device portId 0 am: c8adf1f70e am: cc03484e9d am: d60d3a9746 -s ours am: af61659000 -s ours am: 0c73a00421 -s ours am: 7c5f3e828d -s ours
  [automerger skipped] Set device type on first message received am: 888ee5bea0 am: 9ae5381050 am: ca6ded0248 -s ours am: d66807e357 -s ours am: 7d370f248b -s ours am: f392272bfa -s ours

...

This commit is contained in:

Automerger Merge Worker

2022-04-04 18:20:04 +00:00

committed by Android (Google) Code Review

parent 2fb865dafd ab41f2bf21

commit 9a1726f07b

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