Skip to content
Commit d04223d4 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 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: I77cb7711e4935d6e1940b409f56b6b8925609340
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8dbb517 35ba9290
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