diff options
author | Xin Li <delphij@google.com> | 2023-10-06 11:01:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 11:01:06 +0000 |
commit | 71d77aa9ce22996dec43a463569dd5eee61fd063 (patch) | |
tree | 49371f75f4a89184aee9835c74221075cb30ebcf | |
parent | 0ab3669bdacfd3255e749ab88bd452cbaf883659 (diff) | |
parent | 8665ac12e7477299f7f30d7c35e4d191953a579d (diff) | |
download | okio-71d77aa9ce22996dec43a463569dd5eee61fd063.tar.gz |
[automerger skipped] Merge Android 14 am: 1170b7913b -s ours am: fe9ea942d4 -s ours am: e07f0e3a11 -s ours am: 8665ac12e7 -s ours
am skip reason: Merged-In Ief689f73ffc7a774747b4af06aee5b072dcfe27f with SHA-1 cf2655e673 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okio/+/2775114
Change-Id: Id2638f12db12d477140951017f8abec89ede68c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions