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