commit | 4c0857c9527d04253f77203442c2026926526a3b | [log] [tgz] |
---|---|---|
author | Issei Suzuki <issei@google.com> | Wed Oct 27 15:30:59 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 27 15:30:59 2021 +0000 |
tree | 1265cc4cd6e0d7cc0db23aa3334d56efcebd5fa0 | |
parent | 1c22830676707c5e60841cabd33c50915964f0fc [diff] | |
parent | c34b3262a6ef02b65e12c449e48d10fea0c19753 [diff] |
[automerger skipped] Merge "Add display sleep token information to winscope dump." into sc-v2-dev am: 0f6684e325 am: c34b3262a6 -s ours am skip reason: Merged-In Ia25854feed3bb6b037d4510a6b5000d906d27313 with SHA-1 97f9372e97 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16117039 Change-Id: Ice60a75b02ac67a7a7faefc3c7784048b44c0c9f