Merge "STR: fix suspend abort cause system resume by powerkey event [1/1]" into andro...
authorHongguang Chen <hgchen@google.com>
Tue, 6 Jul 2021 23:54:06 +0000 (23:54 +0000)
committerAndroid Partner Code Review <android-gerrit-partner@google.com>
Tue, 6 Jul 2021 23:54:06 +0000 (23:54 +0000)

Trivial merge