| commit | c16d400fc07077ff76316ef02825ed7f41d4b74a | [log] [tgz] |
|---|---|---|
| author | Zoey Chen <zoeychen@google.com> | Tue May 31 05:29:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 31 05:29:02 2022 +0000 |
| tree | 5a4f1933e73492e73ce051daa83368344a3a9a80 | |
| parent | 050b5a833c97145370db26a90c9e0f1548b137d0 [diff] | |
| parent | e78fbb48aa6e9cd5998ceac67e6c893465a0ddf9 [diff] |
[automerger skipped] Merge "[LeAudio] Move the QrCamera and decorateView from Settings to SettingsLib for Wifi and BT" am: 1a4b945fc4 am: 35ba92905d -s ours am: d04223d4f5 -s ours am: 2ca7ad73fd -s ours am: e78fbb48aa -s ours am skip reason: Merged-In I0d10c9e34cfaeeb0f3cf1f0a2acbfda0cce0df13 with SHA-1 1ecdf9225c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107988 Change-Id: Ifa5382e8f482e7c06ac798a91f5640f554290a26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>