commit | 3b0025c066151417513fc5b4c7742f916952c2b4 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Aug 13 21:20:28 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:20:28 2021 +0000 |
tree | 258a511987c1d6882e7fa19f8acaa6cdec13962c | |
parent | ba61eb9b878a942951c7cc6c7d7362d26a7f0f2f [diff] | |
parent | 7027df47b2d6d343b4c0c20b6e0f4386f10a3915 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 01d6f2938f -s ours am: 7027df47b2 -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: Ia3a4f089056965f908bbbf21913e42be468a6289