| commit | 162f4f23852b83a54cb05324cd0acda083d243ca | [log] [tgz] |
|---|---|---|
| author | Austin Borger <borgera@google.com> | Wed Aug 23 00:59:10 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 23 00:59:10 2023 +0000 |
| tree | 2fc709838bdbad2471b4d8ab00b92dc52a788ed0 | |
| parent | 3471ac79c9248938b4868cd4a3f7854cdce99601 [diff] | |
| parent | e8993caffe4d000c5f1c1ffec802583fdbd906d6 [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 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: I2f543c38838bfa61490bc7bdafe46c37e0f9b27d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>