commit | bbe6228c54e3e6487ca2f5165ed54920cde9c163 | [log] [tgz] |
---|---|---|
author | Wei Sheng Shih <wilsonshih@google.com> | Mon Aug 03 14:48:26 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 03 14:48:26 2020 +0000 |
tree | 1760f2c774d4aef41be97c860d6ff94e59763453 | |
parent | 5fa0c6d621e6d289fd22a16f9b09f186100f2edb [diff] | |
parent | 4aadb5e4ddb52ad2fb9c94fe393c7c655bc214a8 [diff] |
[automerger skipped] Merge "Prevent sleep tokens from being created recursively." into rvc-qpr-dev am: 712847301b am: 4aadb5e4dd -s ours am skip reason: Change-Id I168dfe0fa101cb65eb676ca256c03439c8e4193d with SHA-1 3f51a96792 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12279995 Change-Id: I446e4a17991f544e1ee686f6d49cbb9a5fb0cdcd