| commit | e78fbb48aa6e9cd5998ceac67e6c893465a0ddf9 | [log] [tgz] |
|---|---|---|
| author | Zoey Chen <zoeychen@google.com> | Tue May 31 04:51:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 31 04:51:05 2022 +0000 |
| tree | 8d97c2d6a8313dedff17d4a789aab898ae0010eb | |
| parent | d8e6df6e192243853db824e4e4da9927aed389e1 [diff] | |
| parent | 2ca7ad73fd8ac03de40a5d929f696bb4184e9b42 [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 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: Ifd1030edcd534978e369ce0e173649d97d404224 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>