OSDN Git Service

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 4ad3a2452a -s ours am: ea2ec38...
authorXin Li <delphij@google.com>
Wed, 3 Mar 2021 23:36:58 +0000 (23:36 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Wed, 3 Mar 2021 23:36:58 +0000 (23:36 +0000)
commitb891eab6efa527227397e7cb173e4b7f159f4969
tree4b8e76a9bd57f770f6f9e5c200900a2c749f69b1
parent601e3c3e3fb2b445f8bd22963e43dd931a53368b
parentea2ec388c5a327ce27d52dc0eeeb48060afd32e7
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 4ad3a2452a -s ours am: ea2ec388c5 -s ours

am skip reason: Change-Id I70d48f04611d3bd380b8e29d21e590e69c6bfe0c with SHA-1 a74d9d71fe is in history

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1613672

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa0822a69cc3068ee2ace7652955f185dc666c51