| commit | e59b183159feff12bbf4a92a566f8816f86dfd9e | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 08:29:58 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 08:29:58 2021 +0000 |
| tree | 46a6d340c53d08a5ce6a98e852357936044ea561 | |
| parent | 01b3864c930bb47369c3fc87f1f15655cb3a628d [diff] | |
| parent | 621469a1c6b4d3871a7773bd8247761b1ae20ba7 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 4d35a9054f -s ours am: 722cdc84c9 -s ours am: 1d3e3083bb -s ours am: 621469a1c6 -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: I25d3351b71755f1bfa8ee11cc9ac6bfbde1e53c5