diff options
| author | 2024-05-13 17:31:52 +0000 | |
|---|---|---|
| committer | 2024-05-13 17:31:52 +0000 | |
| commit | 395762a1d999afb1af09a369a4c58f712699bfcb (patch) | |
| tree | cd27f91d7d34f59fbb7e6e410d54d0eb1ddaee1a /libs/androidfw/StringPool.cpp | |
| parent | 0a2aaee7419c139dae57d6db75be14c2c83b2764 (diff) | |
| parent | 3d85c9daa9a27aed697dedaa84cd1d85e0da6b08 (diff) | |
[automerger skipped] Merge "camera2: Ensure SessionCharacteristics and CameraCharactersitics can be used interchangeably" into 24D1-dev am: 3d85c9daa9 -s ours
am skip reason: Merged-In Ia7ac40c768480a39fe0d1dd9392b5777b0fc2694 with SHA-1 22d63688cd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27281431
Change-Id: Ibeb738af08b1f97b76f632c4c55705e8c9db8546
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions