diff options
| author | 2023-10-09 20:06:37 +0000 | |
|---|---|---|
| committer | 2023-10-09 20:06:37 +0000 | |
| commit | 9aaa3d07c061641612c2c671a9074312290f7272 (patch) | |
| tree | e0a436c7c764ab6d35f14f87adf7aa9ec32abdc0 /libs/androidfw/FileStream.cpp | |
| parent | 9ac3fdd429bb9c358130978b668fc35cf0bf8f35 (diff) | |
| parent | 04e5d8bf97e783f771cc04e83d1bafe4aa8bc23a (diff) | |
Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 240808177e am: fe790c6685 am: 9d1ae98784 -s ours am: 31c2eb6356 -s ours am: 70ae1f4e77 -s ours am: ffeefd0734 -s ours" into udc-d1-dev-plus-aosp am: aeccbc583b -s ours am: 04e5d8bf97 -s ours
am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 e5e5d53c31 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788
Change-Id: I3ce5a6fb0f8a2d381c9dc5c2b1be3d55d64b2b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions