| commit | 54947f61a3cbcc5cc5aa06fcd6a238749cfa3e04 | [log] [tgz] |
|---|---|---|
| author | Austin Borger <borgera@google.com> | Wed Aug 23 02:11:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 23 02:11:33 2023 +0000 |
| tree | bb3ee9266c69c46d41574a262e017a9c5a08e720 | |
| parent | 598649ef94ce5f11a0ff7df09005a37df90a01f0 [diff] | |
| parent | 9d2082a263691b35e2ef618af1b99c2c2749e0d6 [diff] |
[automerger skipped] Merge "cameraservice: Migrate all internal String8/String16s to std::string" into main am: ef3122064e am: 74713f0e0e -s ours am: e8993caffe -s ours am: 162f4f2385 -s ours am: 9d2082a263 -s ours am skip reason: Merged-In I7aee6696f149244c643ec1399815155f3f562538 with SHA-1 f43da6e822 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2706302 Change-Id: I080e33906cabe369e699e17154565cc2a3c911a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>