commit | 6162ea96867142ee7ebffb6dd2655deded0c6f68 | [log] [tgz] |
---|---|---|
author | Austin Borger <borgera@google.com> | Tue Aug 22 20:00:02 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 22 20:00:02 2023 +0000 |
tree | eb3d2b59b6a665e423b6cf72bbc507ccf29253b9 | |
parent | 6ab3fe6d1f0ee43cb76c17cfdc02a71687519820 [diff] | |
parent | 830246b60b4c844b24542b17ff8f2e2d4206ae37 [diff] |
[automerger skipped] Merge "cameraservice: Migrate all internal String8/String16s to std::string" into udc-dev-plus-aosp am: 69deaace0c am: 4d2ca1995d -s ours am: 830246b60b -s ours am skip reason: Merged-In I7aee6696f149244c643ec1399815155f3f562538 with SHA-1 07eac69e2e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24452942 Change-Id: I3da684dc984d803289527a1890f9f3abd05ae027 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>