| commit | 1d3e3083bb092f23e046877a4e82db85bde2977a | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 01:39:40 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 01:39:40 2021 +0000 |
| tree | 46a6d340c53d08a5ce6a98e852357936044ea561 | |
| parent | 03287911a8a8f7864ecafdafa242b5782c06823a [diff] | |
| parent | 722cdc84c98d2a4b9072d13a980fb09bd4837f1c [diff] |
[automerger skipped] Merge "Merge Android 12" am: 4d35a9054f -s ours am: 722cdc84c9 -s ours am skip reason: Merged-In I25227a7fb2fa4341f901e9e152fc2d85aac5f432 with SHA-1 25583eb8d5 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/1847164 Change-Id: Ic5c14c325f717d2a9d4cc37336d047e696d177fa