| commit | 6d5046f1ce0665cb5bb5d5bdb3d1fb9158fa6759 | [log] [tgz] |
|---|---|---|
| author | Kholoud Mohamed <kholoudm@google.com> | Mon Sep 18 18:07:11 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:07:11 2023 +0000 |
| tree | eec22e61a9e1d09d7978f45151f4e1c5d8067ec2 | |
| parent | 3291fd27bce0bdc9e7e37ebaf40be7119e561a5f [diff] | |
| parent | 5fc4a1feae4df990014a2f41a558ac0de59a99b7 [diff] |
[automerger skipped] Merge "Fix bug in getCameraDisabled for a specified admin" into udc-qpr-dev am: 6c91ff383f am: 5fc4a1feae -s ours am skip reason: Merged-In Id6695fd589e172ff98029bccf1174b9ca4e34d6c with SHA-1 3b428b8ef4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24706508 Change-Id: I2ea678a8908206cdf9fc436445866e5deff735e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>