| commit | d04223d4f5f28f18b7548aab3af33a99a875bdd9 | [log] [tgz] |
|---|---|---|
| author | Zoey Chen <zoeychen@google.com> | Tue May 31 04:22:37 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 31 04:22:37 2022 +0000 |
| tree | 3edeb43bac43b8604b986220d54443e58c13f164 | |
| parent | b8dbb517592d851a18e31e215be82916c2adc84d [diff] | |
| parent | 35ba92905dbfb72f9e7dbfcb0e9db968b9abec4a [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 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: I77cb7711e4935d6e1940b409f56b6b8925609340 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>