diff options
| author | 2023-08-22 16:54:52 +0000 | |
|---|---|---|
| committer | 2023-08-22 16:54:52 +0000 | |
| commit | bf17a554c63d15abeb6bb560baa1bdf03744db37 (patch) | |
| tree | 577254f9d38d320aae65ceaf4207897ac1f0bb5b /libs/androidfw/FileStream.cpp | |
| parent | 5e3c4341f2c72b8db934b0dad79798ddbf36a3a9 (diff) | |
| parent | ef579d627bdae0f378d04b521e693d4a096b7de7 (diff) | |
Merge changes from topic "am-052d63f52c03415992131e8d017ee02c" into main
* changes:
[automerger skipped] Merge "cameraservice: Migrate all internal String8/String16s to std::string" into udc-qpr-dev-plus-aosp am: 0b822b8ba3 -s ours
[automerger skipped] cameraservice: Migrate all internal String8/String16s to std::string am: 07eac69e2e -s ours
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions