commit | 29fb7b0fac9350458c6297227841c100333da1ac | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Aug 13 21:20:26 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:20:26 2021 +0000 |
tree | 90f9fb4988cf916cb93fa512fbdec47ab6181b62 | |
parent | 294abe0d3df25d8423f4f5fbfeea09d1f0f6393e [diff] | |
parent | 7c43eb78fec8237a67cf7ed833368c0659e2da2f [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 5d24e2e477 -s ours am: 7c43eb78fe -s ours am skip reason: Merged-In I2cdd175793d51e42886e0b1eb31528afb2093b25 with SHA-1 3ef522cf6c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/15546327 Change-Id: If942a600ebb2f8b34287144d1a80aedea74ca6d7