commit | 2ee13182e3afbc7287701353dc817ececa2e8c1a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Aug 13 20:51:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 20:51:44 2021 +0000 |
tree | 218515d2bed8d2266965be9ecf9d34a8dd7962f8 | |
parent | e564a83cb2ef2e8d58836b7b5929ef06cfb3c24f [diff] | |
parent | 01d6f2938fef45cfbbbfe220aa2d56a49058a0f9 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 01d6f2938f -s ours am skip reason: Merged-In I38cc89bc7f81f8d6d6165a4b8f344c0660c10364 with SHA-1 ee3097ce79 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/15550142 Change-Id: I3055ea9a28e0450709de5858582444211905c0d9