Skip to content
Commit 2ca7ad73 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[LeAudio] Move the QrCamera and decorateView from... 

[automerger skipped] Merge "[LeAudio] Move the QrCamera and decorateView from Settings to SettingsLib for Wifi and BT" am: 1a4b945f am: 35ba9290 -s ours am: d04223d4 -s ours

am skip reason: Merged-In I0d10c9e34cfaeeb0f3cf1f0a2acbfda0cce0df13 with SHA-1 1ecdf922 is already in history

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



Change-Id: I8a7db02bbb26d7867fe36a516a531162b78b774e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e3a324f d04223d4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment